ossapi 3.1.4__tar.gz → 3.1.6__tar.gz

{ossapi-3.1.4 → ossapi-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossapi
-Version: 3.1.4
+Version: 3.1.6
 Summary: Complete python wrapper for osu! api v2 and v1.
 Author-email: Liam DeVoe <orionldevoe@gmail.com>
 Project-URL: Homepage, https://github.com/circleguard/ossapi

{ossapi-3.1.4 → ossapi-3.1.6}/ossapi/ossapiv2_async.py

@@ -108,14 +108,9 @@ class Oauth2SessionAsync(OAuth2Session):
                 else:
                     raise
 
-        # No, we should not be using a session for every request. Yes, we are
-        # not achieving 100% performance by doing this. The benefit is that we
-        # don't require `async with OssapiAsync(...) as api:` syntax in order to
-        # use ossapi.
-        async with aiohttp.ClientSession() as session:
-            return await session.request(
-                method, url, headers=headers, data=data, **kwargs
-            )
+        return await session.request(
+            method, url, headers=headers, data=data, **kwargs
+        )
 
 # our `request` function below relies on the ordering of these types. The
 # base type must come first, with any auxiliary types that the base type accepts
@@ -606,15 +601,22 @@ class OssapiAsync:
                 f"{self.BASE_URL}{url}", session=aiohttp_session,
                 params=params, data=data)
 
-        self.log.info(f"made {method} request to {r.real_url}, data {data}")
+        # aiohttp annoyingly differentiates between url (no url fragments, for
+        # some reason) and real_url (actual url). They also use a URL object
+        # here instead of a string.
+        url = str(r.real_url)
+        self.log.info(f"made {method} request to {url}, data {data}")
         json_ = await r.json()
-        self.log.debug(f"received json: \n{json.dumps(json_, indent=4)}")
-        self._check_response(json_, r.url)
-
         # aiohttp sessions have to live as long as any responses returned via
         # the session. Wait to close it until we're done with the response `r`.
+        # Make sure we close this before we call _check_response, or any errors
+        # there will result in the session not being closed. We should probably
+        # move this to a try/finally block at some point for safety.
         await aiohttp_session.close()
 
+        self.log.debug(f"received json: \n{json.dumps(json_, indent=4)}")
+        self._check_response(json_, url)
+
         return self._instantiate_type(type_, json_)
 
     def _check_response(self, json_, url):

{ossapi-3.1.4 → ossapi-3.1.6}/ossapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossapi
-Version: 3.1.4
+Version: 3.1.6
 Summary: Complete python wrapper for osu! api v2 and v1.
 Author-email: Liam DeVoe <orionldevoe@gmail.com>
 Project-URL: Homepage, https://github.com/circleguard/ossapi

{ossapi-3.1.4 → ossapi-3.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ossapi"
-version = "3.1.4"
+version = "3.1.6"
 description = "Complete python wrapper for osu! api v2 and v1."
 readme = "README.md"
 keywords = ["osu!", "wrapper", "api", "python"]