0.6.2

MarcoSa-2000 · Jun 5, 2023 · f44b7a6 · f44b7a6
1 parent 9820ec6
commit f44b7a6
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,15 @@
 # animegifs.py
+<p align="center">
+    <a href="https://pypi.org/project/animegifs/">
+    <img src="https://img.shields.io/pypi/dm/animegifs?logo=PyPI&style=for-the-badge" alt="PyPi Downloads"/></a>
+    <a href="https://discord.gg/TKZJ4GJj2z">
+    <img src="https://img.shields.io/discord/856005478789677096?logo=Discord&style=for-the-badge" alt="Discord Server"/></a>
+    <a href="https://pypi.org/project/animegifs/">
+    <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/MarcoSa-2000/animegifs?style=for-the-badge"></a>
+    <img alt="PyPI - Python Version" src="https://img.shields.io/pypi/pyversions/animegifs?logo=Python&logoColor=%23FFFF00&style=for-the-badge">
+    <img alt="GitHub watchers" src="https://img.shields.io/github/watchers/MarcoSa-2000/animegifs?style=social">
+</p>
+
 Get random anime gifs by category. Use Python (intended (for now) for Discord).
 
 WIP - updated in time to time. Versions below v0.5.3 aren't expected to work flawlessly or at all. Version below v0.6 will not have the gifs library updated anymore.
@@ -89,4 +100,7 @@ malid = gifs.get_malId(gif) #get the ID of the gif's anime myanimelist page.
 * Random
 * Steal-magic
 
-WIP.
+#Troubleshooting and other
+
+If you encounter an error raise an issue on the issue page: https://github.com/MarcoSa-2000/animegifs/issues 
+or join the discord server to request new categories, new functions, feedback and even errors.
diff --git a/animegifs/animegifs.py b/animegifs/animegifs.py
@@ -1,6 +1,6 @@
 import random
-from animegifs.distutils import gifs, errors
 from mal import Anime
+from animegifs.distutils import gifs, errors
 
 class Animegifs:
 
@@ -24,7 +24,7 @@ def get_gif(self, category: str) -> str:
         """
         if type(category) is int:
             raise errors.CategoryIntegral(category)
-        elif category.lower() in gifs.gifs_name_list:
+        if category.lower() in gifs.gifs_name_list:
             if category.lower() == 'random':
                 gif_list = []
                 for key, gif_url in gifs.access().items():
@@ -57,8 +57,8 @@ def get_mal(self, gif) -> str:
                     result = gif_name[1]
                     try:
                         mal = f"https://myanimelist.net/anime/{int(result)}/"
-                    except ValueError:
-                        raise errors.MethodNotUpdated(gif)
+                    except ValueError as exc:
+                        raise errors.MethodNotUpdated(gif) from exc
                     return mal
             else:
                 continue

diff --git a/animegifs/distutils/errors.py b/animegifs/distutils/errors.py
@@ -42,3 +42,25 @@ def __init__(self, gif, error="Method not yet available for this gif."):
         self.gif = gif
         self.error = error
         super().__init__(self.error)
+
+class AuthTimeout(Exception):
+    """
+    Authentication request timed out. Probably status 504 on server side. Check your connection too.
+    """
+
+    def __init__(self, exc, error="Authentication request timed out."):
+        self.exc = exc
+        self.error = error
+        super().__init__(self.error)
+
+class AuthError(Exception):
+    """
+    Authentication request returned an error. Probably status error 4xx.
+    It will be resolved soon, if it persist,
+    issue an issue on https://github.com/MarcoSa-2000/animegifs/issues.
+    """
+
+    def __init__(self, exc, error="Authentication request returned an error."):
+        self.exc = exc
+        self.error = error
+        super().__init__(self.error)
diff --git a/animegifs/distutils/gifs.py b/animegifs/distutils/gifs.py
@@ -1,6 +1,7 @@
 import json
 import requests
 import jwt
+from animegifs.distutils import errors
 
 global TOKEN
 TOKEN = None
@@ -24,8 +25,18 @@
                   'yawn']
 
 def authentication():
-    response = requests.post("https://enkidu-app-5a3qq2fqya-uc.a.run.app/key1")
-    auth_key = response.json()['key']
+    try:
+        response = requests.post("https://enkidu-app-5a3qq2fqya-uc.a.run.app/key1", timeout=10)
+    except requests.exceptions.Timeout:
+        try:
+            response = requests.post("https://enkidu-app-5a3qq2fqya-uc.a.run.app/key1", timeout=25)
+        except requests.exceptions.Timeout as exc:
+            raise errors.AuthTimeout(exc)
+    if response.status_code == 200:
+        auth_key = response.json()['key']
+    else:
+        exc = response.status_code
+        raise errors.AuthError(exc)
     return auth_key
 
 def access():

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
     long_description = "\n" + fh.read()
 
 LONG_DESCRIPTION = long_description
-VERSION = '0.6.1'
+VERSION = '0.6.2'
 
 setup(
     name='animegifs',
@@ -29,7 +29,10 @@
     ],
     python_requires='>=3.8',
     classifiers=[
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "License :: OSI Approved :: MIT License",
         "Operating System :: Microsoft :: Windows"],
     keywords=['anime', 'gif', 'python', 'anime-gif', 'discord'],