osu.py 2.2.2__tar.gz → 2.2.3__tar.gz

{osu_py-2.2.2/osu.py.egg-info → osu_py-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osu.py
-Version: 2.2.2
+Version: 2.2.3
 Summary: API Wrapper for osu!api v2 written in Python.
 Home-page: https://github.com/Sheepposu/osu.py
 Author: Sheepposu

{osu_py-2.2.2 → osu_py-2.2.3}/osu/__init__.py

@@ -14,4 +14,4 @@ from .util import (
 from .results import *
 
 
-__version__ = "2.2.2"
+__version__ = "2.2.3"

{osu_py-2.2.2 → osu_py-2.2.3}/osu/asyncio/client.py

@@ -1492,6 +1492,22 @@ class AsynchronousClient:
         res = await self.http.make_request(Path.get_users(), **{"ids[]": ids})
         return list(map(UserCompact, res["users"]))
 
+    async def lookup_users(self, users: list[int, str]):
+        """
+        Lookup users by a mix of user ids and usernames.
+        Can lookup maximum 50 at a time.
+
+        ids: Sequence[Union[:class:`int`, :class:`str`]]
+            Can be a list of user ids and usernames.
+            Usernames should be prefixed with "@" to make sure they're interpreted as usernames by the api.
+
+        **Returns**
+
+        Sequence[:class:`UserCompact`]
+        """
+        res = await self.http.make_request(Path.get_users(), **{"ids[]": users})
+        return list(map(UserCompact, res["users"]))
+
     async def get_wiki_page(self, locale: str, path: str) -> WikiPage:
         """
         The wiki article or image data.

{osu_py-2.2.2 → osu_py-2.2.3}/osu/client.py

@@ -1450,6 +1450,7 @@ class Client:
     def get_users(self, ids: Sequence[int]) -> List[UserCompact]:
         """
         Returns list of users.
+        Can get maximum 50 at a time.
 
         Requires OAuth and scope public
 
@@ -1465,9 +1466,22 @@ class Client:
             Includes attributes: country, cover, groups, statistics_rulesets.
         """
         res = self.http.make_request(Path.get_users(), **{"ids[]": ids})
-        import json
-        with open("users.json", "w", encoding="utf-8") as f:
-            json.dump(res["users"], f)
+        return list(map(UserCompact, res["users"]))
+
+    def lookup_users(self, users: list[int, str]):
+        """
+        Lookup users by a mix of user ids and usernames.
+        Can lookup maximum 50 at a time.
+
+        ids: Sequence[Union[:class:`int`, :class:`str`]]
+            Can be a list of user ids and usernames.
+            Usernames should be prefixed with "@" to make sure they're interpreted as usernames by the api.
+
+        **Returns**
+
+        Sequence[:class:`UserCompact`]
+        """
+        res = self.http.make_request(Path.get_users(), **{"ids[]": users})
         return list(map(UserCompact, res["users"]))
 
     def get_wiki_page(self, locale: str, path: str) -> WikiPage:

{osu_py-2.2.2 → osu_py-2.2.3}/osu/objects/score.py

@@ -1,7 +1,7 @@
 from dateutil import parser
 from typing import Optional, List, TYPE_CHECKING, Union, Dict
 
-from .beatmap import BeatmapCompact, BeatmapsetCompact
+from .beatmap import BeatmapCompact, BeatmapsetCompact, Beatmap
 from .user import UserCompact
 from .current_user_attributes import ScoreUserAttributes
 from ..enums import GameModeStr, GameModeInt, Mods, Mod, ObjectType, ScoreRank
@@ -176,6 +176,10 @@ class SoloScore:
 
     beatmap_id: Optional[:class:`int`]
 
+    beatmap: Optional[:class:`Beatmap`]
+
+    beatmapset: Optional[:class:`BeatmapsetCompact`]
+
     ended_at: :class:`datetime.datetime`
 
     max_combo: :class:`int`
@@ -249,6 +253,8 @@ class SoloScore:
         "user",
         "current_user_attributes",
         "weight",
+        "beatmap",
+        "beatmapset"
     )
 
     def __init__(self, data):
@@ -280,6 +286,8 @@ class SoloScore:
             data, "current_user_attributes", ScoreUserAttributes
         )
         self.weight: Optional[PpWeight] = get_optional(data, "weight", PpWeight)
+        self.beatmap: Optional[Beatmap] = get_optional(data, "beatmap", Beatmap)
+        self.beatmapset: Optional[BeatmapsetCompact] = get_optional(data, "beatmapset", BeatmapsetCompact)
 
     def __repr__(self):
         return prettify(self, "beatmap_id", "statistics")
@@ -306,11 +314,10 @@ class PpWeight:
 
 
 def get_score_object(data) -> Union[SoloScore, LegacyScore]:
-    # EAFP cuz type attribute is not reliable
-    try:
+    if data["type"] == "solo_score":
         return SoloScore(data)
-    except KeyError:
-        return LegacyScore(data)
+
+    return LegacyScore(data)
 
 
 class ScoreStatistics:

{osu_py-2.2.2 → osu_py-2.2.3}/osu/objects/user.py

@@ -338,6 +338,9 @@ class User(UserCompact):
     post_count: :class:`int`
         number of forum posts
 
+    profile_hue: Optional[:class:`int`]
+        Custom color hue in HSL degrees (0-359).
+
     profile_order: List[:class:`str`]
         Ordered list of sections in user profile page. Sections consist of:
         me, recent_activity, beatmaps, historical, kudosu, top_ranks, medals
@@ -365,6 +368,7 @@ class User(UserCompact):
         "playmode",
         "playstyle",
         "post_count",
+        "profile_hue",
         "profile_order",
         "title",
         "title_url",
@@ -387,6 +391,7 @@ class User(UserCompact):
         self.playmode: GameModeStr = GameModeStr(get_required(data, "playmode"))
         self.playstyle: List[str] = get_required(data, "playstyle")
         self.post_count: int = get_required(data, "post_count")
+        self.profile_hue: Optional[int] = get_required(data, "profile_hue")
         self.profile_order: List[str] = get_required(data, "profile_order")
         self.title: Optional[str] = get_required(data, "title")
         self.title_url: Optional[str] = get_required(data, "title_url")

{osu_py-2.2.2 → osu_py-2.2.3}/osu/path.py

@@ -172,6 +172,10 @@ class Path:
     def get_users(cls):
         return cls("get", "users", "public")
 
+    @classmethod
+    def lookup_users(cls):
+        return cls("get", "users/lookup", "public")
+
     @classmethod
     def get_wiki_page(cls, locale, path):
         return cls("get", f"wiki/{locale}/{path}", None)

{osu_py-2.2.2 → osu_py-2.2.3/osu.py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osu.py
-Version: 2.2.2
+Version: 2.2.3
 Summary: API Wrapper for osu!api v2 written in Python.
 Home-page: https://github.com/Sheepposu/osu.py
 Author: Sheepposu