Skip to content
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.

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

Add as_json to responses #861

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 20 additions & 1 deletion mcstatus/responses.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from dataclasses import dataclass
from dataclasses import asdict, dataclass
from typing import Any, TYPE_CHECKING

from mcstatus.forge_data import ForgeData, RawForgeData
Expand Down Expand Up @@ -101,6 +101,25 @@ def build(cls, *args, **kwargs) -> Self:
"""
raise NotImplementedError("You can't use abstract methods.")

def as_dict(self) -> dict[str, Any]:
"""Return the dataclass as JSON-serializable :class:`dict`.

Do note that this method doesn't return :class:`string <str>` but
:class:`dict`, so you can do some processing on returned value.

Difference from
:attr:`~mcstatus.responses.JavaStatusResponse.raw` is in that,
:attr:`~mcstatus.responses.JavaStatusResponse.raw` returns raw response
in the same format as we got it. This method returns the response
in a more user-friendly JSON serializable format (for example,
:attr:`~mcstatus.responses.BaseStatusResponse.motd` is returned as a
:func:`Minecraft string <mcstatus.motd.Motd.to_minecraft>` and not
:class:`dict`).
"""
as_dict = asdict(self)
as_dict["motd"] = self.motd.simplify().to_minecraft()
return as_dict
Copy link
Member Author

Choose a reason for hiding this comment

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

Though only response classes (JavaStatusResponse and BedrockStatusResponse) have this method, not JavaStatusPlayer. But for classes without motd inside, it is easier to use dataclasses.asdict to be honest.



@dataclass(frozen=True)
class JavaStatusResponse(BaseStatusResponse):
Expand Down
10 changes: 10 additions & 0 deletions tests/responses/test_bedrock.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ def test_optional_parameters_is_none(self, field, pop_index):
build = BedrockStatusResponse.build(parameters, 123.0)
assert getattr(build, field) is None

def test_as_dict(self, build: BedrockStatusResponse):
assert build.as_dict() == {
"gamemode": "Default",
"latency": 123.0,
"map_name": "map name here",
"motd": "§4G§6a§ey§2B§1o§9w§ds§4e§6r",
"players": {"max": 69, "online": 1},
"version": {"brand": "MCPE", "name": "1.18.100500", "protocol": 422},
}


@BaseResponseTest.construct
class TestBedrockStatusPlayers(BaseResponseTest):
Expand Down
18 changes: 18 additions & 0 deletions tests/responses/test_java.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@ class TestJavaStatusResponse(BaseResponseTest):
def build(self) -> JavaStatusResponse:
return JavaStatusResponse.build(self.RAW) # type: ignore # dict[str, Unknown] cannot be assigned to TypedDict

def test_as_dict(self, build: JavaStatusResponse):
assert build.as_dict() == {
"enforces_secure_chat": True,
"forge_data": None,
"icon": "data:image/png;base64,foo",
"latency": 0,
"motd": "A Minecraft Server",
"players": {"max": 20, "online": 0, "sample": None},
"raw": {
"description": "A Minecraft Server",
"enforcesSecureChat": True,
"favicon": "data:image/png;base64,foo",
"players": {"max": 20, "online": 0},
"version": {"name": "1.8-pre1", "protocol": 44},
},
"version": {"name": "1.8-pre1", "protocol": 44},
}


@BaseResponseTest.construct
class TestJavaStatusPlayers(BaseResponseTest):
Expand Down
Loading