finished, ready for the update

Author: Dhruva Shaw

README.rst

@@ -23,7 +23,7 @@ Key Features
 Installing
 ----------
 
-**Python 3.8 or higher is required**
+**Python 3.9 or higher is required**
 
 To install the library, you can just run the following command:
 
@@ -50,7 +50,7 @@ To install the development version, do the following:
 
 .. code:: sh
 
-    $ git clone https://github.com/Dhruvacube/fluxpoint.py
+    $ git clone https://github.com/Creatrix-Net/fluxpoint.py
     $ cd fluxpoint.py
     $ python3 -m pip install -U .[speed]
 
@@ -65,23 +65,23 @@ Quick Example
       import sys
 
       # setting up the fluxpoint client handler
-      a = FluxpointClient(api_token="get api token from https://fluxpoint.dev/api/access")
+      a = FluxpointClient(api_token="get api token from fluxpoint.dev/api/access")
 
       # setting up the windows loop policy according to the operating system
       if sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
           asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
-      # getting the image url of AZURLANE image
-      print(asyncio.run(a.azurlane()))
+      # getting the random dadjoke
+      print(asyncio.run(a.dadjoke()))
 
 
-You can find more examples in the `examples directory <https://github.com/Dhruvacube/fluxpoint.py/tree/master/examples>`_.
+You can find more examples in the `examples directory <https://github.com/Creatrix-Net/fluxpoint.py/tree/master/examples>`_.
 
 Links
 ------
 
-- `Documentation <https://fluxpointpy.readthedocs.io/en/latest/>`_
+- `Documentation <https://fluxpointpy.dhruvashaw.in/en/latest/>`_
 - `Official Support Discord Server <https://discord.gg/vfXHwS3nmQ>`_
 - `Official Fluxpoint server <https://discord.gg/fluxpoint>`_
 - `Get Fluxpoint api access <https://fluxpoint.dev/api/access>`_
-- `Official Fluxpoint api docs <https://bluedocs.page/fluxpoint-api>`_
+- `Official Fluxpoint api docs <https://docs.fluxpoint.dev/api>`_

examples/custom_generator_image.py

@@ -4,15 +4,15 @@
 from fluxpoint import FluxpointClient, ImageUrl, Square, Text
 
 # setting up the fluxpoint client handler
-a = FluxpointClient(api_token="get api token from https://fluxpoint.dev/api/access")
+a = FluxpointClient(api_token="get api token from fluxpoint.dev/api/access")
 
 # setting up the windows loop policy according to the operating system
 if sys.platform.startswith(('win32', 'cygwin')):
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 # getting the image bytes data
-data = asyncio.run(a.customimage(
-    type="bitmap",
+data = asyncio.run(a.custom(
+    imgtype="bitmap",
     width=2000,
     height=2000,
     color="#7289da",

examples/custom_generator_test.py

@@ -1,17 +1,18 @@
 import asyncio
 import sys
 
-from fluxpoint import FluxpointClient
+from fluxpoint import Tests
+from fluxpoint.vars import ImageType
 
 # setting up the fluxpoint client handler
-a = FluxpointClient(api_token="get api token from https://fluxpoint.dev/api/access")
+a = Tests(api_token="get api token from fluxpoint.dev/api/access")
 
 # setting up the windows loop policy according to the operating system
 if sys.platform.startswith(('win32', 'cygwin')):
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
 # getting the image bytes data
-data = asyncio.run(a.test())
+data = asyncio.run(a.imagen(ImageType.PNG))
 
 #saving the image into a file
 with open('custom_generator_test.png', 'wb+') as f:

examples/simple_request.py

@@ -1,14 +1,13 @@
+from fluxpoint import FluxpointClient
 import asyncio
 import sys
 
-from fluxpoint import FluxpointClient
-
 # setting up the fluxpoint client handler
-a = FluxpointClient(api_token="get api token from https://fluxpoint.dev/api/access")
+a = FluxpointClient(api_token="get api token from fluxpoint.dev/api/access")
 
 # setting up the windows loop policy according to the operating system
-if sys.platform.startswith(('win32', 'cygwin')):
+if sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
-# getting the image url of AZURLANE image
-print(asyncio.run(a.azurlane()))
+# getting the random dadjoke
+print(asyncio.run(a.dadjoke()))

examples/welcome_image.py

@@ -4,7 +4,7 @@
 from fluxpoint import FluxpointClient, WelcomeConfig
 
 # setting up the fluxpoint client handler
-a = FluxpointClient(api_token="get api token from https://fluxpoint.dev/api/access")
+a = FluxpointClient(api_token="get api token from fluxpoint.dev/api/access")
 
 # setting up the windows loop policy according to the operating system
 if sys.platform.startswith(('win32', 'cygwin')):

fluxpoint/client.py

@@ -1,7 +1,7 @@
-from .paths import Gifs, Images, NSFW, Misc, Welcome, ImageGenerator
+from .paths import Convert,Color,CustomImage,Template,ImgAndGif,Lists,Minecraft,Misc,Utility
 
 
-class FluxpointClient(Gifs, Images, NSFW, Misc, Welcome, ImageGenerator):
+class FluxpointClient(Convert,Color,CustomImage,Template,ImgAndGif,Lists,Minecraft,Misc,Utility):
     '''The fluxpoint client where all the api routes are located'''
 
     def __str__(self) -> str:

fluxpoint/errors.py

@@ -1,3 +1,7 @@
+from enum import EnumType
+from typing import Any
+
+
 class HttpException(Exception):
     """
     Fluxpoint base exception class use this base class to catch any Fluxpoint errors.
@@ -63,3 +67,19 @@ class InvalidFeature(Exception):
     """
     The feature chosen is not valid
     """
+
+def paramEnumValidCheck(parameter: Any, class2check: EnumType) -> None:
+    """
+    Checks if the ``parameter`` is a member of ``class2check`` :class::`Enum` and check if ``parameter`` is a instance of ``class2check`` :class::`Enum`
+
+    :raises ValueError: if ``parameter`` is not a member of ``class2check``
+
+    :param parameter: The parameter to check
+    :type parameter: :class:`Any`
+    :param class2check: The class to check
+    :type class2check: :class:`EnumType`
+    """
+    if isinstance(parameter, class2check):
+        raise Exception("Category must be a instance of NSFWImage or NSFWGif")
+    if parameter not in class2check:
+        raise ValueError(f"{parameter} is not a valid in {class2check}")

fluxpoint/http.py

@@ -24,17 +24,17 @@ def __init__(self, api_token: str) -> None:
 
     async def request(
         self,
-        method: RequestTypes,
-        endpoint: str,
-        params: Optional[dict] = None,
-        json: Optional[dict] = None,
-        data: Optional[str] = None,
-        headers: Optional[dict] = None,
-        _base_url: Optional[Union[str, URL]] = 'https://api.fluxpoint.dev/',
-        retry: bool = True,
-        return_json: bool = True,
-        return_bytes: bool = False,
-        retry_times: int = 1
+            method: RequestTypes,
+            endpoint: str,
+            params: Optional[dict] = None,
+            json: Optional[dict] = None,
+            data: Optional[str, aiohttp.FormData] = None,
+            headers: Optional[dict] = None,
+            _base_url: Optional[Union[str, URL]] = 'https://api.fluxpoint.dev/',
+            retry: bool = True,
+            return_json: bool = True,
+            return_bytes: bool = False,
+            retry_times: int = 1
     ) -> Union[aiohttp.ClientResponse, dict, io.IOBase]:
         """Makes an API request
 
@@ -62,7 +62,7 @@ async def request(
                     return await self.request(method, endpoint, json, headers, retry=retry_times <= 10, retry_times=retry_times+1)
 
                 try:
-                    result = await response.json(content_type="application/json") if return_json else (await response.read()if return_bytes else response)
+                    result = await response.json(content_type="application/json") if return_json else (await response.read() if return_bytes else response)
                     if response.status == 200:
                         return result
                     result = await response.json(content_type="application/json") if not isinstance(result, dict) else result

fluxpoint/paths/color.py

@@ -1,7 +1,5 @@
-from urllib.parse import urlencode
 from typing import Optional, AsyncGenerator
 
-from fluxpoint import ParameterError
 from fluxpoint.vars import RequestTypes
 from fluxpoint.http import BaseHTTP
 

fluxpoint/paths/convert.py

@@ -1,5 +1,9 @@
+from fluxpoint.errors import paramEnumValidCheck
 from fluxpoint.vars import RequestTypes
 from fluxpoint.http import BaseHTTP
+from fluxpoint.vars import ImageType
+import io
+import aiohttp
 
 class Convert(BaseHTTP):
     """Convert Api endpoints documented in https://docs.fluxpoint.dev/api/endpoints/convert
@@ -9,4 +13,64 @@ def __init__(self, *args, **kwargs) -> None:
         self.__baseurl = '/convert'
         super().__init__(*args, **kwargs)
 
+    @staticmethod
+    def imgdata2form(image: io.IOBase) -> aiohttp.FormData:
+        """
+        Converts image data to formdata
 
+        :param image: image data
+        :type image: :class:`io.IOBase`
+        :return: aiohttp form data class
+        :rtype: :class:`aiohttp.FormData`
+        """
+        form = aiohttp.FormData()
+        form.add_field("file", image, filename="upload", content_type="application/octet-stream")
+        return form
+
+    async def html2markdown(self, html:str) -> str:
+        """
+        Convert html to markdown
+        :param html: The html to convert
+        :type html: str
+        :return: The converted html to markdown
+        :rtype: str
+        """
+        return (await self.request(RequestTypes.POST, f'{self.__baseurl}/html-markdown',data=html)).get('markdown')
+
+    async def markdown2html(self, markdown:str) -> str:
+        """
+        Convert markdown to html
+        :param markdown: The markdown to convert
+        :type markdown: str
+        :return: The converted markdown to html
+        :rtype: str
+        """
+        return (await self.request(RequestTypes.POST, f'{self.__baseurl}/markdown-html',data=markdown)).get('html')
+
+    async def image2type(self, image: io.IOBase, imgtype: ImageType, quality: int = 100) -> io.IOBase:
+        """
+        Convert an image to png/jpg/webp
+
+        :raises ValueError: When the ``quality`` parameter is not between ``1`` and ``100``
+
+        :param image: The image to convert
+        :type image: :class:`io.IOBase`
+        :param quality: The quality to convert to
+        :type quality: int
+        :param imgtype: The type to convert to
+        :type imgtype: :class:`ImageType`
+
+        :return: The converted image
+        :rtype: :class:`io.IOBase`
+        """
+        if quality > 100 or quality < 1:
+            raise ValueError("The return quality value must be between 1 and 100")
+        paramEnumValidCheck(image, ImageType)
+        return await self.request(
+            RequestTypes.POST,
+            f'{self.__baseurl}/image-{imgtype.value}',
+            data=self.__class__.imgdata2form(image),
+            return_bytes=True,
+            return_json=False,
+            params={"quality": quality}
+        )