Move raise_for_status into request.py

Author: Katistic

vrcpy/aobjects.py

@@ -6,16 +6,13 @@
 class Avatar(o.Avatar):
     async def author(self):
         resp = await self.client.api.call("/users/"+self.authorId)
-        self.client._raise_for_status(resp)
         return User(self.client, resp["data"])
 
 ## User
 
 class LimitedUser(o.LimitedUser):
     async def fetch_full(self):
         resp = await self.client.api.call("/users/"+self.id)
-        self.client._raise_for_status(resp)
-
         return User(self.client, resp["data"])
 
     async def public_avatars(self):
@@ -25,7 +22,6 @@ async def public_avatars(self):
 
         resp = await self.client.api.call("/avatars",
             params={"userId": self.id})
-        self.client._raise_for_status(resp)
 
         avatars = []
         for avatar in resp["data"]:
@@ -39,16 +35,13 @@ async def unfriend(self):
         '''
 
         resp = await self.client.api.call("/auth/user/friends/"+self.id, "DELETE")
-        self.client._raise_for_status(resp)
 
     async def friend(self):
         '''
         Returns Notification object
         '''
 
         resp = await self.client.api.call("/user/"+self.id+"/friendRequest", "POST")
-        self.client._raise_for_status(resp)
-
         return o.Notification(self.client, resp["data"])
 
 class User(o.User, LimitedUser):
@@ -94,7 +87,6 @@ async def update_info(self, email=None, status=None,\
             if params[p] == None: params[p] = getattr(self, p)
 
         resp = await self.client.api.call("/users/"+self.id, "PUT", params=params)
-        self.client._raise_for_status(resp)
 
         self.client.me = CurrentUser(self.client, resp["data"])
         return self.client.me
@@ -109,7 +101,6 @@ async def avatars(self, releaseStatus=types.ReleaseStatus.All):
 
         resp = await self.client.api.call("/avatars",
             params={"releaseStatus": releaseStatus, "user": "me"})
-        self.client._raise_for_status(resp)
 
         avatars = []
         for avatar in resp["data"]:
@@ -151,7 +142,6 @@ async def __cinit__(self):
 class LimitedWorld(o.LimitedWorld):
     async def author(self):
         resp = await self.client.api.call("/users/"+self.authorId)
-        self.client._raise_for_status(resp)
         return User(self.client, resp["data"])
 
 class World(o.World, LimitedWorld):
@@ -168,8 +158,6 @@ async def fetch_instance(self, id):
         '''
 
         resp = await self.client.api.call("/instances/"+self.id+":"+id)
-        self.client._raise_for_status(resp)
-
         return Instance(self.client, resp["data"])
 
     async def __cinit__(self):
@@ -182,7 +170,6 @@ async def __cinit__(self):
 class Instance(o.Instance):
     async def world(self):
         resp = await self.client.api.call("/worlds/"+self.worldId)
-        self.client._raise_for_status(resp)
         return World(resp["data"])
 
 # Misc

vrcpy/client.py

@@ -1,6 +1,6 @@
 from vrcpy._hardtyping import *
 from vrcpy.request import *
-from vrcpy.errors import *
+from vrcpy.errors import AlreadyLoggedInError
 from vrcpy import objects
 from vrcpy import aobjects
 
@@ -29,7 +29,6 @@ def fetch_me(self):
         '''
 
         resp = self.api.call("/auth/user")
-        self._raise_for_status(resp)
 
         self.me = objects.CurrentUser(self, resp["data"])
         return self.me
@@ -82,7 +81,6 @@ def fetch_friends(self, offline=False, n=0, offset=0):
             last_count = 0
 
             resp = self.api.call("/auth/user/friends", params={"offset": offset, "offline": offline, "n": newn})
-            self._raise_for_status(resp)
 
             for friend in resp["data"]:
                 last_count += 1
@@ -104,8 +102,6 @@ def fetch_user_by_id(self, id):
         '''
 
         resp = self.api.call("/users/"+id)
-        self._raise_for_status(resp)
-
         return objects.User(self, resp["data"])
 
     def fetch_user_by_name(self, name):
@@ -117,8 +113,6 @@ def fetch_user_by_name(self, name):
         '''
 
         resp = self.api.call("/users/"+urllib.parse.urlencode(name)+"/name")
-        self._raise_for_status(resp)
-
         return objects.User(self, resp["data"])
 
     # Avatar calls
@@ -132,8 +126,6 @@ def fetch_avatar(self, id):
         '''
 
         resp = self.api.call("/avatars/"+id)
-        self._raise_for_status(resp)
-
         return objects.Avatar(self, resp["data"])
 
     def list_avatars(self, user: oString = None, featured: oBoolean = None, tag: oString = None,\
@@ -160,7 +152,6 @@ def list_avatars(self, user: oString = None, featured: oBoolean = None, tag: oSt
         if platform: p["platform"] = platform
 
         resp = self.api.call("/avatars", params=p)
-        self._raise_for_status(resp)
 
         avatars = []
         for avatar in resp["data"]:
@@ -179,8 +170,6 @@ def fetch_world(self, id):
         '''
 
         resp = self.api.call("/worlds/"+id)
-        self._raise_for_status(resp)
-
         return objects.World(self, resp["data"])
 
     def logout(self):
@@ -189,7 +178,6 @@ def logout(self):
         '''
 
         resp = self.api.call("/logout", "PUT")
-        self._raise_for_status(resp)
 
         self.api.new_session()
         self.loggedIn = False
@@ -205,43 +193,11 @@ def login(self, username, password):
         auth = str(base64.b64encode(auth.encode()))[2:-1]
 
         resp = self.api.call("/auth/user", headers={"Authorization": "Basic "+auth}, no_auth=True)
-        self._raise_for_status(resp)
 
         self.api.set_auth(auth)
         self.me = objects.CurrentUser(self, resp["data"])
         self.loggedIn = True
 
-    def _raise_for_status(self, resp):
-        def handle_400():
-            if resp["data"]["error"]["message"] == "These users are not friends":
-                raise NotFriendsError("These users are not friends")
-            elif resp["data"]["error"]["message"] == "\"Users are already friends!\"":
-                raise AlreadyFriendsError("Users are already friends!")
-
-        def handle_401():
-            raise IncorrectLoginError(resp["data"]["error"]["message"])
-
-        def handle_404():
-            msg = ""
-
-            if type(resp["data"]) == bytes:
-                try: msg = json.loads(resp["data"].decode())["error"]
-                except: msg = str(resp["data"].decode()).split("\"error\":\"")[1].split("\",\"")[0]
-            else:
-                msg = resp["data"]["error"]["message"]
-
-            raise NotFoundError(msg)
-
-        switch = {
-            400: lambda: handle_400(),
-            401: lambda: handle_401(),
-            404: lambda: handle_404()
-        }
-
-        if resp["status"] in switch: switch[resp["status"]]()
-        if resp["status"] != 200: raise GeneralError("Unhandled error occured: "+str(resp["data"]))
-        if "requiresTwoFactorAuth" in resp["data"]: raise TwoFactorAuthNotSupportedError("2FA is not supported yet.")
-
     def __init__(self, verify=True):
         self.api = Call(verify)
         self.loggedIn = False
@@ -257,9 +213,7 @@ async def fetch_me(self):
         '''
 
         self.cacheFull = False
-
         resp = await self.api.call("/auth/user")
-        self._raise_for_status(resp)
 
         self.me = aobjects.CurrentUser(self, resp["data"])
         return self.me
@@ -312,7 +266,6 @@ async def fetch_friends(self, offline=False, n=0, offset=0):
             last_count = 0
 
             resp = await self.api.call("/auth/user/friends", params={"offset": offset, "offline": offline, "n": newn})
-            self._raise_for_status(resp)
 
             for friend in resp["data"]:
                 last_count += 1
@@ -334,8 +287,6 @@ async def fetch_user_by_id(self, id):
         '''
 
         resp = await self.api.call("/users/"+id)
-        self._raise_for_status(resp)
-
         return aobjects.User(self, resp["data"])
 
     async def fetch_user_by_name(self, name):
@@ -347,8 +298,6 @@ async def fetch_user_by_name(self, name):
         '''
 
         resp = await self.api.call("/users/"+urllib.parse.urlencode(name)+"/name")
-        self._raise_for_status(resp)
-
         return aobjects.User(self, resp["data"])
 
     # Avatar calls
@@ -362,8 +311,6 @@ async def fetch_avatar(self, id):
         '''
 
         resp = await self.api.call("/avatars/"+id)
-        self._raise_for_status(resp)
-
         return aobjects.Avatar(self, resp["data"])
 
     async def list_avatars(self, user: oString = None, featured: oBoolean = None, tag: oString = None,\
@@ -390,7 +337,6 @@ async def list_avatars(self, user: oString = None, featured: oBoolean = None, ta
         if platform: p["platform"] = platform
 
         resp = await self.api.call("/avatars", params=p)
-        self._raise_for_status(resp)
 
         avatars = []
         for avatar in resp["data"]:
@@ -409,8 +355,6 @@ async def fetch_world(self, id):
         '''
 
         resp = await self.api.call("/worlds/"+id)
-        self._raise_for_status(resp)
-
         return aobjects.World(self, resp["data"])
 
     async def login(self, username, password):
@@ -424,7 +368,6 @@ async def login(self, username, password):
         auth = str(base64.b64encode(auth.encode()))[2:-1]
 
         resp = await self.api.call("/auth/user", headers={"Authorization": "Basic "+auth}, no_auth=True)
-        self._raise_for_status(resp)
 
         self.api.openSession(auth)
         self.me = aobjects.CurrentUser(self, resp["data"])
@@ -436,7 +379,6 @@ async def logout(self):
         '''
 
         resp = await self.api.call("/logout", "PUT")
-        self._raise_for_status(resp)
 
         await self.api.closeSession()
         await asyncio.sleep(0)