This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68

Closed
yezz123 wants to merge 1 commit into from
Closed

chore(ref): Improve Codebase and Refactor some functions #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deta/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
project_key, project_id = _get_project_key_id()
return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

def AsyncBase(self, name: str, host: str = None):
from ._async.client import _AsyncBase

return _AsyncBase(name, self.project_key, self.project_id, host)

def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
try:
resp = urllib.request.urlopen(req)
if resp.getcode() != 200:
raise Exception(resp.read().decode("utf-8"))
raise ValueError(resp.read().decode("utf-8"))
except urllib.error.URLError as e:
raise Exception(e.reason)
raise Exception(e.reason) from e
41 changes: 11 additions & 30 deletions deta/_async/client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
expire_in: int = None,
expire_at: typing.Union[int, float, datetime.datetime] = None,
):
if not isinstance(data, dict):
data = {"value": data}
else:
data = data.copy()

data = data.copy() if isinstance(data, dict) else {"value": data}
if key:
data["key"] = key

insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
async with self._session.post(
f"{self._base_url}/items", json={"item": data}
) as resp:
async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
return await resp.json()

async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
expire_in: int = None,
expire_at: typing.Union[int, float, datetime.datetime] = None,
):
if not isinstance(data, dict):
data = {"value": data}
else:
data = data.copy()

data = data.copy() if isinstance(data, dict) else {"value": data}
if key:
data["key"] = key

insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
async with self._session.put(
f"{self._base_url}/items", json={"items": [data]}
) as resp:
if resp.status == 207:
resp_json = await resp.json()
return resp_json["processed"]["items"][0]
else:
async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
if resp.status != 207:
return None
resp_json = await resp.json()
return resp_json["processed"]["items"][0]

async def put_many(
self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
data = i
if not isinstance(i, dict):
data = {"value": i}
insert_ttl(
data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
)
insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
_items.append(data)

async with self._session.put(
f"{self._base_url}/items", json={"items": _items}
) as resp:
async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
return await resp.json()

async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
resp_json = await resp.json()
paging = resp_json.get("paging")
return FetchResponse(
paging.get("size"), paging.get("last"), resp_json.get("items")
)
return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

async def update(
self,
Expand All@@ -155,7 +136,7 @@ async def update(
expire_in: int = None,
expire_at: typing.Union[int, float, datetime.datetime] = None,
):
if key == "":
if not key:
raise ValueError("Key is empty")

payload = {
Expand Down
62 changes: 20 additions & 42 deletions deta/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
def __init__(self, count=0, last=None, items=[]):
def __init__(self, count=0, last=None, items=None):
if items is None:
items = []
self._count = count
self._last = last
self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
return self._items

def __eq__(self, other):
return (
self.count == other.count
and self.last == other.last
and self.items == other.items
)
return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
self.util = Util()

def get(self, key: str):
if key == "":
if not key:
raise ValueError("Key is empty")

# encode key
key = quote(key, safe="")
_, res = self._request("/items/{}".format(key), "GET")
_, res = self._request(f"/items/{key}", "GET")
return res or None

def delete(self, key: str):
"""Delete an item from the database
key: the key of item to be deleted
"""
if key == "":
if not key:
raise ValueError("Key is empty")

# encode key
key = quote(key, safe="")
self._request("/items/{}".format(key), "DELETE")
self._request(f"/items/{key}", "DELETE")
return None

def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
expire_in: int = None,
expire_at: typing.Union[int, float, datetime.datetime] = None,
):
if not isinstance(data, dict):
data = {"value": data}
else:
data = data.copy()

data = data.copy() if isinstance(data, dict) else {"value": data}
if key:
data["key"] = key

insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
code, res = self._request(
"/items", "POST", {"item": data}, content_type=JSON_MIME
)
code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
if code == 201:
return res
elif code == 409:
raise Exception("Item with key '{4}' already exists".format(key))
raise ValueError("Item with key '{4}' already exists".format(key))

@eriwianaeriwianaJan 8, 2023

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change
raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")


def put(
self,
Expand All@@ -146,18 +138,12 @@ def put(
If `key` is not provided, the server will generate a random 12 chars key.
"""

if not isinstance(data, dict):
data = {"value": data}
else:
data = data.copy()

data = data.copy() if isinstance(data, dict) else {"value": data}
if key:
data["key"] = key

insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
code, res = self._request(
"/items", "PUT", {"items": [data]}, content_type=JSON_MIME
)
code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
return res["processed"]["items"][0] if res and code == 207 else None

def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
data = i
if not isinstance(i, dict):
data = {"value": i}
insert_ttl(
data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
)
insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
_items.append(data)

_, res = self._request(
"/items", "PUT", {"items": _items}, content_type=JSON_MIME
)
_, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
return res

def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
last: str = None,
) -> typing.Optional[typing.Tuple[int, list]]:
"""This is where actual fetch happens."""
payload = {
"limit": buffer,
"last": last if not isinstance(last, bool) else None,
}
payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

if query:
payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
`key` is the kye of the item to be updated
"""

if key == "":
if not key:
raise ValueError("Key is empty")

payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
)

encoded_key = quote(key, safe="")
code, _ = self._request(
"/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
)
code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

if code == 200:
return None
elif code == 404:
raise Exception("Key '{}' not found".format(key))
raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down
12 changes: 4 additions & 8 deletions deta/drive.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
if not chunk:
break
yield chunk

def iter_lines(self, chunk_size: int = 1024):
while True:
chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
Returns a DriveStreamingBody.
"""
assert name, "No name provided"
_, res = self._request(
f"/files/download?name={self._quote(name)}", "GET", stream=True
)
_, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
if res:
return DriveStreamingBody(res)
return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
"""
assert names, "Names is empty"
assert len(names) <= 1000, "More than 1000 names to delete"
_, res = self._request(
"/files", "DELETE", {"names": names}, content_type=JSON_MIME
)
_, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
return res

def delete(self, name: str):
def delete(self, name: str): # sourcery skip: raise-specific-error
"""Delete a file from drive.
`name` is the name of the file.
Returns the name of the file deleted.
Expand Down
15 changes: 4 additions & 11 deletions deta/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
self.host = host
self.timeout = timeout
self.keep_alive = keep_alive
self.client = (
http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
)
self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

def _is_socket_closed(self):
if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

## return json if application/json
payload = (
json.loads(res.read())
if JSON_MIME in res.getheader("content-type")
else res.read()
json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
)

if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
while retry > 0:
try:
if not self.keep_alive or reinitializeConnection:
self.client = http.client.HTTPSConnection(
host=self.host, timeout=self.timeout
)
self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

self.client.request(
method,
url,
headers=headers,
body=body,
)
res = self.client.getresponse()
return res
return self.client.getresponse()
except http.client.RemoteDisconnected:
reinitializeConnection = True
retry -= 1
2 changes: 1 addition & 1 deletion deta/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
if project_id == project_key:
raise AssertionError("Bad project key provided")

return project_key, project_id
return project_key, project_id
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Oct 22, 2024. It is now read-only.

chore(ref): Improve Codebase and Refactor some functions#68
 Closed

yezz123
wants to merge
1
commit into

from

 Closed


chore(ref): Improve Codebase and Refactor some functions
#68
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 3 additions & 3 deletions
deta/__init__.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,6 @@
__version__ = "1.1.0"



def Base(name: str):
 project_key, project_id = _get_project_key_id()
 return _Base(name, project_key, project_id)
Expand All@@ -45,6 +44,7 @@ def Base(self, name: str, host: str = None):

 def AsyncBase(self, name: str, host: str = None):
 from ._async.client import _AsyncBase

 return _AsyncBase(name, self.project_key, self.project_id, host)

 def Drive(self, name: str, host: str = None):
Expand DownExpand Up@@ -80,6 +80,6 @@ def send_email(to, subject, message, charset="UTF-8"):
 try:
 resp = urllib.request.urlopen(req)
 if resp.getcode() != 200:
 raise Exception(resp.read().decode("utf-8"))
 raise ValueError(resp.read().decode("utf-8"))
 except urllib.error.URLError as e:
 raise Exception(e.reason)
 raise Exception(e.reason) from e

41 changes: 11 additions & 30 deletions
deta/_async/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -62,18 +62,12 @@ async def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.post(
 f"{self._base_url}/items", json={"item": data}
 ) as resp:
 async with self._session.post(f"{self._base_url}/items", json={"item": data}) as resp:
 return await resp.json()

 async def put(
Expand All@@ -84,23 +78,16 @@ async def put(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 async with self._session.put(
 f"{self._base_url}/items", json={"items": [data]}
 ) as resp:
 if resp.status == 207:
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]
 else:
 async with self._session.put(f"{self._base_url}/items", json={"items": [data]}) as resp:
 if resp.status != 207:
 return None
 resp_json = await resp.json()
 return resp_json["processed"]["items"][0]

 async def put_many(
 self,
Expand All@@ -116,14 +103,10 @@ async def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 async with self._session.put(
 f"{self._base_url}/items", json={"items": _items}
 ) as resp:
 async with self._session.put(f"{self._base_url}/items", json={"items": _items}) as resp:
 return await resp.json()

 async def fetch(
Expand All@@ -143,9 +126,7 @@ async def fetch(
 async with self._session.post(f"{self._base_url}/query", json=payload) as resp:
 resp_json = await resp.json()
 paging = resp_json.get("paging")
 return FetchResponse(
 paging.get("size"), paging.get("last"), resp_json.get("items")
 )
 return FetchResponse(paging.get("size"), paging.get("last"), resp_json.get("items"))

 async def update(
 self,
Expand All@@ -155,7 +136,7 @@ async def update(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand Down

62 changes: 20 additions & 42 deletions
deta/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,9 @@


class FetchResponse:
 def __init__(self, count=0, last=None, items=[]):
 def __init__(self, count=0, last=None, items=None):
 if items is None:
 items = []
 self._count = count
 self._last = last
 self._items = items
Expand All@@ -30,11 +32,7 @@ def items(self):
 return self._items

 def __eq__(self, other):
 return (
 self.count == other.count
 and self.last == other.last
 and self.items == other.items
 )
 return self.count == other.count and self.last == other.last and self.items == other.items


class Util:
Expand DownExpand Up@@ -88,24 +86,24 @@ def __init__(self, name: str, project_key: str, project_id: str, host: str = Non
 self.util = Util()

 def get(self, key: str):
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 _, res = self._request("/items/{}".format(key), "GET")
 _, res = self._request(f"/items/{key}", "GET")
 return res or None

 def delete(self, key: str):
 """Delete an item from the database
 key: the key of item to be deleted
 """
 if key == "":
 if not key:
 raise ValueError("Key is empty")

 # encode key
 key = quote(key, safe="")
 self._request("/items/{}".format(key), "DELETE")
 self._request(f"/items/{key}", "DELETE")
 return None

 def insert(
Expand All@@ -116,22 +114,16 @@ def insert(
 expire_in: int = None,
 expire_at: typing.Union[int, float, datetime.datetime] = None,
 ):
 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "POST", {"item": data}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "POST", {"item": data}, content_type=JSON_MIME)
 if code == 201:
 return res
 elif code == 409:
 raise Exception("Item with key '{4}' already exists".format(key))
 raise ValueError("Item with key '{4}' already exists".format(key))
@eriwianaeriwianaJan 8, 2023

Copy link


Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this one should be changed into f-string too

Suggested change

raiseValueError("Item with key '{4}' already exists".format(key))
raiseValueError(f"Item with key '{key}' already exists")

 def put(
 self,
Expand All@@ -146,18 +138,12 @@ def put(
 If `key` is not provided, the server will generate a random 12 chars key.
 """

 if not isinstance(data, dict):
 data = {"value": data}
 else:
 data = data.copy()

 data = data.copy() if isinstance(data, dict) else {"value": data}
 if key:
 data["key"] = key

 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 code, res = self._request(
 "/items", "PUT", {"items": [data]}, content_type=JSON_MIME
 )
 code, res = self._request("/items", "PUT", {"items": [data]}, content_type=JSON_MIME)
 return res["processed"]["items"][0] if res and code == 207 else None

 def put_many(
Expand All@@ -173,14 +159,10 @@ def put_many(
 data = i
 if not isinstance(i, dict):
 data = {"value": i}
 insert_ttl(
 data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at
 )
 insert_ttl(data, self.__ttl_attribute, expire_in=expire_in, expire_at=expire_at)
 _items.append(data)

 _, res = self._request(
 "/items", "PUT", {"items": _items}, content_type=JSON_MIME
 )
 _, res = self._request("/items", "PUT", {"items": _items}, content_type=JSON_MIME)
 return res

 def _fetch(
Expand All@@ -190,10 +172,7 @@ def _fetch(
 last: str = None,
 ) -> typing.Optional[typing.Tuple[int, list]]:
 """This is where actual fetch happens."""
 payload = {
 "limit": buffer,
 "last": last if not isinstance(last, bool) else None,
 }
 payload = {"limit": buffer, "last": None if isinstance(last, bool) else last}

 if query:
 payload["query"] = query if isinstance(query, list) else [query]
Expand DownExpand Up@@ -232,7 +211,7 @@ def update(
 `key` is the kye of the item to be updated
 """

 if key == "":
 if not key:
 raise ValueError("Key is empty")

 payload = {
Expand DownExpand Up@@ -263,13 +242,12 @@ def update(
 )

 encoded_key = quote(key, safe="")
 code, _ = self._request(
 "/items/{}".format(encoded_key), "PATCH", payload, content_type=JSON_MIME
 )
 code, _ = self._request(f"/items/{encoded_key}", "PATCH", payload, content_type=JSON_MIME)

 if code == 200:
 return None
 elif code == 404:
 raise Exception("Key '{}' not found".format(key))
 raise ValueError(f"Key '{key}' not found")


def insert_ttl(item, ttl_attribute, expire_in=None, expire_at=None):
Expand Down

12 changes: 4 additions & 8 deletions
deta/drive.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ def iter_chunks(self, chunk_size: int = 1024):
 if not chunk:
 break
 yield chunk

 def iter_lines(self, chunk_size: int = 1024):
 while True:
 chunk = self.__stream.readline(chunk_size)
Expand DownExpand Up@@ -74,9 +74,7 @@ def get(self, name: str):
 Returns a DriveStreamingBody.
 """
 assert name, "No name provided"
 _, res = self._request(
 f"/files/download?name={self._quote(name)}", "GET", stream=True
 )
 _, res = self._request(f"/files/download?name={self._quote(name)}", "GET", stream=True)
 if res:
 return DriveStreamingBody(res)
 return None
Expand All@@ -88,12 +86,10 @@ def delete_many(self, names: typing.List[str]):
 """
 assert names, "Names is empty"
 assert len(names) <= 1000, "More than 1000 names to delete"
 _, res = self._request(
 "/files", "DELETE", {"names": names}, content_type=JSON_MIME
 )
 _, res = self._request("/files", "DELETE", {"names": names}, content_type=JSON_MIME)
 return res

 def delete(self, name: str):
 def delete(self, name: str): # sourcery skip: raise-specific-error
 """Delete a file from drive.
 `name` is the name of the file.
 Returns the name of the file deleted.
Expand Down

15 changes: 4 additions & 11 deletions
deta/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,9 +24,7 @@ def __init__(
 self.host = host
 self.timeout = timeout
 self.keep_alive = keep_alive
 self.client = (
 http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None
 )
 self.client = http.client.HTTPSConnection(host, timeout=timeout) if keep_alive else None

 def _is_socket_closed(self):
 if not self.client.sock:
Expand DownExpand Up@@ -92,9 +90,7 @@ def _request(

 ## return json if application/json
 payload = (
 json.loads(res.read())
 if JSON_MIME in res.getheader("content-type")
 else res.read()
 json.loads(res.read()) if JSON_MIME in res.getheader("content-type") else res.read()
 )

 if not self.keep_alive:
Expand All@@ -113,18 +109,15 @@ def _send_request_with_retry(
 while retry > 0:
 try:
 if not self.keep_alive or reinitializeConnection:
 self.client = http.client.HTTPSConnection(
 host=self.host, timeout=self.timeout
 )
 self.client = http.client.HTTPSConnection(host=self.host, timeout=self.timeout)

 self.client.request(
 method,
 url,
 headers=headers,
 body=body,
 )
 res = self.client.getresponse()
 return res
 return self.client.getresponse()
 except http.client.RemoteDisconnected:
 reinitializeConnection = True
 retry -= 1

2 changes: 1 addition & 1 deletion
deta/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,4 +13,4 @@ def _get_project_key_id(project_key: str = None, project_id: str = None):
 if project_id == project_key:
 raise AssertionError("Bad project key provided")

 return project_key, project_id
 return project_key, project_id
Loading