Skip to content

fix: fix DictSerializerMixin.update sets models into json #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Toricane merged 3 commits into from
Jul 22, 2022
Merged

fix: fix DictSerializerMixin.update sets models into json #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f705bf1
fix: fix putting class instance in json
Damego Jul 20, 2022
b786c12
ci: correct from checks.
pre-commit-ci[bot] Jul 20, 2022
18c33b1
refactor: remove datetime import
Damego Jul 20, 2022
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
9 changes: 0 additions & 9 deletions interactions/api/gateway/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
new_event_loop,
sleep,
)
from datetime import datetime
from sys import platform, version_info
from time import perf_counter
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, Union
Expand Down Expand Up @@ -438,14 +437,6 @@ def __modify_guild_cache():
old_obj = self._http.cache[model].get(id)

if old_obj:
for key, value in old_obj._json.items():
if hasattr(value, "_json"):
old_obj._json[key] = value._json
elif isinstance(value, Snowflake):
old_obj._json[key] = int(value)
elif isinstance(value, datetime):
old_obj._json[key] = value.isoformat()

before = model(**old_obj._json)
old_obj.update(**obj._json)
else:
Expand Down
26 changes: 5 additions & 21 deletions interactions/api/models/attrs_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,24 +50,9 @@ def __init__(self, kwargs_dict: dict = None, /, **other_kwargs):
if value is not None and attrib.metadata.get("add_client"):
if isinstance(value, list):
for item in value:
if isinstance(item, dict):
item["_client"] = client
elif isinstance(item, ClientSerializerMixin):
item._client = client

item["_client"] = client
else:
if isinstance(value, dict):
value["_client"] = client
elif isinstance(value, ClientSerializerMixin):
value._client = client

# make sure json is recursively handled
if isinstance(value, list):
self._json[attrib_name] = [
i._json if hasattr(i, "_json") else i for i in value
]
elif hasattr(value, "_json"):
self._json[attrib_name] = value._json # type: ignore
value["_client"] = client

passed_kwargs[attrib_name] = value

Expand Down Expand Up @@ -110,11 +95,10 @@ def update(self, kwargs_dict: dict = None, /, **other_kwargs):
if value is None:
continue

if converter := attribs[name].converter:
value = converter(value)

self._json[name] = value
setattr(self, name, value)
setattr(
self, name, converter(value) if (converter := attribs[name].converter) else value
)


@attrs.define(eq=False, init=False, on_setattr=attrs.setters.NO_OP)
Expand Down