simple-rule34 0.1.5.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

SimpleRule34/Rule34.py

@@ -1,213 +1,149 @@
 import random
 import time
-import typing
 
-import requests
+import aiohttp
 import datetime
 import logging
 import xml.etree.ElementTree as ET
 
 from .exceptions import *
-from .types import Rule34MainPost, Rule34PostData, Rule34SamplePost, Rule34PreviewPost
-
-
-def parse_result(post_element):
-
-
-    id = int(post_element.get('id'))
-    height = int(post_element.get('height'))
-    width = int(post_element.get('width'))
-    url = post_element.get('file_url')
-
-    sample_height = int(post_element.get('sample_height'))
-    sample_width = int(post_element.get('sample_width'))
-    sample_url = post_element.get('sample_url')
-
-    sample_post = Rule34SamplePost(sample_height, sample_width, sample_url, id)
-
-    preview_height = int(post_element.get('preview_height'))
-    preview_width = int(post_element.get('preview_width'))
-    preview_url = post_element.get('preview_url')
-
-    preview_post = Rule34PreviewPost(preview_height, preview_width, preview_url, id)
-
-    score = int(post_element.get('score'))
-    rating = post_element.get('rating')
-    creator_id = int(post_element.get('creator_id'))
-    tags = post_element.get('tags')
-    has_children = post_element.get('has_children') == 'true'
-    created_date = datetime.datetime.strptime(post_element.get('created_at'), "%a %b %d %H:%M:%S %z %Y")
-    status = post_element.get('status')
-    source = post_element.get('source')
-    has_notes = post_element.get('has_notes') == 'true'
-    has_comments = post_element.get('has_comments') == 'true'
-
-    main_post = Rule34MainPost(score, rating, creator_id, tags, has_children, created_date, status,
-                               source, has_notes, has_comments, height, width, url, id)
-
-    return main_post, sample_post, preview_post
+from .types import *
 
 
 class Rule34Api:
-    """
-    Sync main api class
-
-    """
-
     def __init__(self):
-        self.s = requests.Session()
-
-    def get_post_count(self, tags: str = '') -> int:
-        """
-        This function will search amount of posts with your tags from rule34.xxx
-
-        :param tags: Tags in format 'tag1 tag2 ...'. Base ''
-        :type tags: str
-
-        :return: Amount of posts with current tags
-        :rtype: int
-        """
+        self.header = {'User-Agent': 'rule34-simple-api 0.1.5.6 (Request)'}
+    async def get_post_count(self, tags: str = '') -> int:
+        async with aiohttp.ClientSession(headers=self.header) as session:
+            async with session.get(f'https://api.rule34.xxx/index.php?'
+                                   f'page=dapi&s=post&q=index&tags={tags}') as response:
+                xml_data = await response.text()
 
-
-        r = self.s.get(f'https://api.rule34.xxx/index.php?'
-                       f'page=dapi&s=post&q=index&tags={tags}')
-
-        xml_root = ET.fromstring(r.text)
+        xml_root = ET.fromstring(xml_data)
 
         return int(xml_root.get('count'))
 
-    def get_post(self, id: int) -> typing.Optional[Rule34PostData]:
-        """
-        This function will search post with your id from rule34.xxx
-
-        :param id: id of post
-        :type id: int
-
-        :return: On success, returns Rule34PostData object
-        :rtype: :obj: 'typing.Optional[Rule34PostData]'
-        """
-
-        r = self.s.get(f'https://api.rule34.xxx/index.php?'
-                       f'page=dapi&s=post&q=index&id={id}')
-
-        try:
-            xml_root = ET.fromstring(r.text)
-        except:
-            return None
-        post_element = xml_root.find('post')
+    async def get_post(self, id: int) -> Post:
+        st = time.time()
 
-        parsed = parse_result(post_element)
+        async with aiohttp.ClientSession(headers=self.header) as session:
+            async with session.get(f'https://api.rule34.xxx/index.php?'
+                                   f'json=1&page=dapi&s=post&q=index&id={id}') as response:
+                if response.status != 200:
+                    raise ApiException(f"Api returned status code {response.status} with message"
+                                       f" {await response.text()}")
 
-        if parsed is None:
-            return None
-        else:
-            main_post, sample_post, preview_post = parsed
+                j = await response.json()
+                data = j[0]
 
-        return Rule34PostData(id, main_post, sample_post, preview_post)
+        data["main"] = {
+            "url": data['file_url']
+        }
+        data["preview"] = {
+            "url": data['preview_url']
+        }
+        data["tags"] = data["tags"].split(" ")
 
-    def get_random_post(self, tags: str = '') -> typing.Optional[Rule34PostData]:
-        """
-        This function will search 1 random post with your tags from rule34.xxx
+        logging.debug(f"Post[{id}] where found in {time.time() - st}s")
 
-        :param tags: Tags in format 'tag1 tag2 ...' with which post will be searching. Base ''
-        :type tags: str
+        return Post(**data)
 
-        :return: On success, returns Rule34PostData object
-        :rtype: :obj: 'typing.Optional[Rule34PostData]'
-        """
+    async def get_random_post(self, tags: str = '', forbidden_tags: list[str] = []) -> Post:
+        start_time = time.time()
 
-        post_count = self.get_post_count(tags)
+        post_count = await self.get_post_count(tags)
 
         page_count = post_count // 1000
 
         if page_count > 0:
-            post_list = self.get_post_list(page_id=random.randint(0, page_count if page_count <= 200 else 200),
-                                           tags=tags, limit=1000)
+            post_list = await self.get_post_list(page_id=random.randint(0, page_count if page_count <= 200 else 200),
+                                                 tags=tags, limit=1000)
 
         else:
-            post_list = self.get_post_list(tags=tags, limit=1000)
-
-        return post_list[random.randint(0, len(post_list) - 1)] if len(post_list) > 0 else None
-
-    def get_random_posts(self, tags: str = '', count: int = 8) -> list[Rule34PostData]:
-        """
-        This function will search your amount of random posts with your tags from rule34.xxx
+            post_list = await self.get_post_list(tags=tags, limit=1000)
 
-        :param tags: Tags in format 'tag1 tag2 ...' with which post will be searching. Base ''
-        :type tags: str
+        post_list_ = []
 
-        :param count: Amount of posts that will need to be founded. Base 8
-        :type count: int
+        for post in post_list:
+            if any(tag in forbidden_tags for tag in post.main.tags):
+                pass
+            else:
+                post_list_.append(post)
 
-        :return: List with founded posts
-        :rtype: :obj: 'list[Rule34PostData]'
+        logging.debug(f"Random posts where found in {time.time() - start_time}s")
 
-        """
+        return post_list_[random.randint(0, len(post_list_) - 1)] if len(post_list_) > 0 else None
 
+    async def get_random_posts(self, tags: str = '', count: int = 8, forbidden_tags: list[str] = []) -> list[Post]:
         st = time.time()
 
         request_count = 1
+        true_count = count*20
 
         post_list = []
 
-        if count > 1000:
-            request_count = count // 1000
-
-        for pid in range(request_count + 1):
-            post_list += self.get_post_list(tags=tags)
+        if true_count > 1000:
+            request_count = true_count // 1000
 
-        getted = [post_list[random.randint(0, len(post_list) - 1)] if len(post_list) > 0 else None for x in
-                  range(count)]
+        post_count = await self.get_post_count(tags)
+        page_id = int(random.randint(0, int(post_count / true_count)) / 8)  if post_count >= true_count else 0
 
-        logging.debug(f"{count} random posts where founded in {time.time() - st}")
+        for pid in range(request_count + 1):
+            post_list += await self.get_post_list(tags=tags, forbidden_tags=forbidden_tags,
+                                                  page_id=page_id, limit=true_count if true_count <= 1000 else 1000)
 
-        return getted
+        getted = []
 
-    def get_post_list(self, limit: int = 1000, page_id: int = 0, tags: str = '',
-                      blocked_tags: typing.Optional[str] = None) -> list[Rule34PostData]:
-        """
-        This function will get list of posts with your tags on page
+        for x in range(count):
+            if len(post_list) > 0:
+                getted.append(post_list[random.randint(0, len(post_list) - 1)])
+            else:
+                pass
 
-        :param limit: limit of posts in list. Base value is 1000
-        :type limit: int
+        logging.debug(f"{count} random posts where found in {time.time() - st}s")
 
-        :param page_id: number of page with posts. Base value is 0
-        :type page_id: int
+        return getted
 
-        :param tags: Tags in format 'tag1 tag2 ...' with which post will be searching. Base values is ''
-        :type tags: str
+    async def get_post_list(self, limit: int = 1000, page_id: int = 0, tags: str = '', forbidden_tags: list[str] = [])\
+            -> list[Post]:
+        if limit > 1000:
+            raise ToBigRequestException(f"The max size of request is 1000 when you tried to request {limit}")
 
-        :parameter blocked_tags: Tags that will be banned from search in format 'tag1 tag2 ...'. Base values is None.
-         Can slow search
-        :type blocked_tags: str or None
+        async with aiohttp.ClientSession(headers=self.header) as session:
+            start_time = time.time()
 
-        :return: :obj: 'list[Rule34PostData]'
-        """
+            async with session.get(f'https://api.rule34.xxx/index.php?'
+                                   f'json=1&page=dapi&s=post&q=index&limit={limit}&pid={page_id}&tags={tags}') as response:
+                if response.status != 200:
+                    raise ApiException(f"Api returned status code {response.status} with message"
+                                       f" {await response.text()}")
 
-        if limit > 1000:
-            raise ToBigRequestException(f"The max size of request is 1000 when you tried to request {limit}")
+                data = await response.json()
 
-        start_time = time.time()
+            logging.debug(f"Request with {limit} limit posts were done in {time.time() - start_time}s")
 
-        r = self.s.get(f'https://api.rule34.xxx/index.php?'
-                       f'page=dapi&s=post&q=index&limit={limit}&pid={page_id}&tags={tags}')
+            post_list = []
+            for post_data in data:
+                post_data["main"] = {
+                    "url": post_data['file_url']
+                }
+                post_data["preview"] = {
+                    "url": post_data['preview_url']
+                }
+                post_data["tags"] = post_data["tags"].split(" ")
 
-        logging.debug(f"Request with {limit}limit posts where done in {time.time() - start_time}s")
+                post_list.append(Post(**post_data))
 
-        xml_root = ET.fromstring(r.text)
-        posts = xml_root.findall('post')
-        post_list = []
+            start_time = time.time()
 
-        start_time = time.time()
-        for post_element in posts:
-            parsed = parse_result(post_element)
+            post_list_ = []
 
-            if parsed is None:
-                continue
-            else:
-                main_post, sample_post, preview_post = parsed
+            for post in post_list:
+                if any(tag in forbidden_tags for tag in post.tags):
+                    pass
+                else:
+                    post_list_.append(post)
 
-            post_list.append(Rule34PostData(main_post.id, main_post, sample_post, preview_post))
-        logging.debug(f"Creating {len(posts)} objects where done in {time.time() - start_time}s")
+            logging.debug(f"{len(post_list_)} posts where found in {time.time() - start_time}s")
 
-        return post_list
+            return post_list_

SimpleRule34/aio/types.py

@@ -36,7 +36,7 @@ class Rule34Post:
 
                     file_name = os.path.basename(self.url)
                     save_path = os.path.join(path, file_name)
-                    with aiofiles.open(save_path, 'wb') as file:
+                    async with aiofiles.open(save_path, 'wb') as file:
                         await file.write(await response.read())
 
                     return save_path

SimpleRule34/exceptions.py

@@ -1,5 +1,3 @@
-
-
 class ToBigRequestException(Exception):
     def __init__(self, msg):
         self.msg = msg
@@ -15,3 +13,11 @@ class RequestMoreThanAvailableException(Exception):
 
     def __str__(self):
         return self.msg
+
+
+class ApiException(Exception):
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg

SimpleRule34/types.py

@@ -1,95 +1,62 @@
-import datetime
-import requests
 import os
+import typing
+import aiofiles
+import aiohttp
 
-from .utils import get_file_type, get_file_size
+from aiofiles import os as aos
+from pydantic import BaseModel
 
+from .exceptions import ApiException
+from .utils import get_file_type
 
-class Rule34Post:
-    def __init__(self, height: int, width: int, url: str, id: int):
-        self.path = r'./rule34_download'
-        self.s = requests.Session()
 
-        self.height = height
-        self.width = width
-        self.url = url
-        self.id = id
+class File(BaseModel):
+    url: str
+    type: str = None
 
-        self.file_type = get_file_type(self.url)
+    def __init__(self, /, **data: typing.Any) -> None:
+        super().__init__(**data)
 
-    def __str__(self):
-        return f"<Rule34Post(id={self.id}, height={self.height}, width={self.width}, url={self.url})>"
+        self.type = get_file_type(self.url)
 
-    def get_file_size(self):
-        return get_file_size(self.url, self.s)
-
-    def download(self, path = r'./rule34_download'):
-        r = self.s.get(self.url)
-        if r.status_code == 200:
-            try:
-                os.mkdir(self.path)
-            except:
-                pass
-
-            file_name = os.path.basename(self.url)
-            save_path = os.path.join(path, file_name)
-            with open(save_path, 'wb') as file:
-                file.write(r.content)
-
-            return save_path
-        else:
+    async def download(self, path: str = r'./rule34_download') -> str:
+        try:
+            await aos.mkdir(path)
+        except:
             pass
 
-    def get_bytes(self):
-        r = self.s.get(self.url)
-
-        return r.content
-
-
-class Rule34MainPost(Rule34Post):
-    def __init__(self, score: int, rating: str, creator_id: int, tags: str, has_children: bool,
-                 created_date: datetime.datetime, status: str, source: str, has_notes: bool, has_comments: bool,
-                 height: int, width: int, url: str, id: int):
-        super().__init__(height, width, url, id)
-        self.score = score
-        self.rating = rating
-        self.creator_id = creator_id
-        self.tags = tags.split(" ")
-        self.has_children = has_children
-        self.created_date = created_date
-        self.status = status
-        self.source = source
-        self.has_notes = has_notes
-        self.has_comments = has_comments
-
-    def __str__(self):
-        return f"<Rule34MainPost(id={self.id}, height={self.height}, width={self.width}, url={self.url}," \
-               f" score={self.score}, rating={self.rating}, creator_id={self.creator_id}," \
-               f" has_children={self.has_children}, has_notes={self.has_notes}, has_comments={self.has_comments}" \
-               f" created_date={self.created_date}, status={self.status}, tags={self.tags})>"
-
-    def format_tags(self, format: str = "#"):
-        str_tags = (format + ' ').join(self.tags)
-        return str_tags.split(" ")
-
-
-class Rule34SamplePost(Rule34Post):
-    def __str__(self):
-        return f"<Rule34SamplePost(id={self.id}, height={self.height}, width={self.width}, url={self.url})>"
-
-
-class Rule34PreviewPost(Rule34Post):
-    def __str__(self):
-        return f"<Rule34PreviewPost(id={self.id}, height={self.height}, width={self.width}, url={self.url})>"
-
-
-class Rule34PostData:
-    def __init__(self, id: int, main: Rule34MainPost, sample: Rule34SamplePost, preview: Rule34PreviewPost):
-        self.id = id
-        self.main = main
-        self.sample = sample
-        self.preview = preview
-
-    def __str__(self):
-        return f"<Rule34PostData(id={self.id}, main={str(self.main)}, sample={str(self.sample)}," \
-               f" preview={str(self.preview)})>"
+        async with aiohttp.ClientSession() as session:
+            async with session.get(self.url) as response:
+                if response.status != 200:
+                    raise ApiException(f"Api returned status code {response.status} with message"
+                                       f" {await response.text()}")
+
+                file_name = os.path.basename(self.url)
+                save_path = os.path.join(path, file_name)
+
+                async with aiofiles.open(save_path, 'wb') as file:
+                    await file.write(await response.read())
+
+                return save_path
+
+
+class Post(BaseModel):
+    directory: int
+    hash: str
+    width: int
+    height: int
+    id: int
+    change: int
+    owner: str
+    parent_id: int
+    rating: str
+    sample: bool
+    score: int
+    tags: list
+    source: str
+    status: str
+    has_notes: bool
+    comment_count: int
+
+    main: File
+    preview: File

SimpleRule34/utils.py

@@ -1,13 +1,11 @@
-import requests
 
-
-def get_file_size(url, session: requests.Session):
-    response = session.head(url, allow_redirects=True)
-    if 'Content-Length' in response.headers:
-        size = int(response.headers['Content-Length'])
-        return size
-    else:
-        return None
+async def get_file_size(url, session):
+    async with session.head(url=url, allow_redirects=True) as response:
+        if 'Content-Length' in response.headers:
+            size = int(response.headers['Content-Length'])
+            return size
+        else:
+            return None
 
 
 def get_file_type(url):
@@ -16,20 +14,9 @@ def get_file_type(url):
         return 'photo'
     elif file_extension in ['mp4', 'avi', 'mov']:
         return 'video'
-    elif file_extension == '.gif':
+    elif file_extension == 'gif':
         return 'animation'
     else:
         return None
 
 
-def remove_blocked_tags_posts(post_list, blocked_tags):
-    post_list_ = []
-
-    for post in post_list:
-        if blocked_tags in post.main.tags:
-            pass
-        else:
-            post_list_.append(post)
-
-    return post
-

{simple_rule34-0.1.5.4.dist-info → simple_rule34-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple_rule34
-Version: 0.1.5.4
+Version: 0.1.6
 Summary: Simple api wrapper of rule34.xxx for python with asynchronous support
 Author-email: StarMan12 <author@example.com>
 Project-URL: Homepage, https://github.com/SyperAlexKomp/simple-rule34-api
@@ -50,6 +50,8 @@ Requires-Dist: urllib3 ==2.0.3
 Requires-Dist: yarg ==0.1.9
 Requires-Dist: yarl ==1.9.2
 Requires-Dist: zipp ==3.16.2
+Requires-Dist: aiofiles ~=23.2.1
+Requires-Dist: pydantic ~=2.7.1
 
 # rule34-simple-api
 Simple api wrapper of rule34.xxx for python with asynchronous support

simple_rule34-0.1.6.dist-info/RECORD

@@ -0,0 +1,15 @@
+__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+SimpleRule34/Rule34.py,sha256=yVgZFMuCyC8VHbhxDWO37DnMvodkh9d8RYNRVtaHnIk,5433
+SimpleRule34/__init__.py,sha256=C4IbcJ_rjqBhpENXImVGuEQxf81GUwNaycqNNAY_ROc,31
+SimpleRule34/exceptions.py,sha256=dUpJBROzXWT67ZOLAHWWse0srvMRunIa9rSl1Cs10B8,491
+SimpleRule34/setup.py,sha256=7hNDTD52EAs7W00-Nd5LzvH8H4-Dvc59W8a999LqvW4,735
+SimpleRule34/types.py,sha256=n9y60b96g9wyD8FAZ_ElETBFNnM1F1GAs5VoxzCFI68,1518
+SimpleRule34/utils.py,sha256=fWx-ntJ672NoktH5Ws9-FcO0gtCNVmd8VfxFxjWqsD0,616
+SimpleRule34/aio/ARule34.py,sha256=nZwxmMNo_g_a16U9dJmxFGUIkDtgNB-W0uFH8LJ8tSI,6858
+SimpleRule34/aio/types.py,sha256=919XQt5ydRoLeVxy5HRujc0IeKYlD3crYuH_qvPqdKY,3719
+SimpleRule34/aio/utils.py,sha256=fWx-ntJ672NoktH5Ws9-FcO0gtCNVmd8VfxFxjWqsD0,616
+simple_rule34-0.1.6.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+simple_rule34-0.1.6.dist-info/METADATA,sha256=dDBVIIRhZOzlaayIKolcj74YeEzKpsdGWWPi5bhQ_44,2154
+simple_rule34-0.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simple_rule34-0.1.6.dist-info/top_level.txt,sha256=YI-Z1ijzIjlJw2WeM95PSmClCzIvm24KAlyZi80YVNs,22
+simple_rule34-0.1.6.dist-info/RECORD,,

{simple_rule34-0.1.5.4.dist-info → simple_rule34-0.1.6.dist-info}/top_level.txt

@@ -1 +1,2 @@
 SimpleRule34
+__init__

simple_rule34-0.1.5.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-SimpleRule34/Rule34.py,sha256=3eMo_5a20g8eQVlSwm3EBJVZVlxdiB354EejMRWnqMs,7136
-SimpleRule34/__init__.py,sha256=C4IbcJ_rjqBhpENXImVGuEQxf81GUwNaycqNNAY_ROc,31
-SimpleRule34/exceptions.py,sha256=8MbvBbdb254UaYWfPg3xo_GbSDO6L9iI0d2AFaet9AM,354
-SimpleRule34/setup.py,sha256=7hNDTD52EAs7W00-Nd5LzvH8H4-Dvc59W8a999LqvW4,735
-SimpleRule34/types.py,sha256=PpIHfMlFfRvXAZ_0Seaj9HJH6f_9JpJHCELIoSbeyuo,3278
-SimpleRule34/utils.py,sha256=lVbM6w2z9QwdOhVpff4q73_DfPLxDEXPVlxI2M6aK6I,854
-SimpleRule34/aio/ARule34.py,sha256=nZwxmMNo_g_a16U9dJmxFGUIkDtgNB-W0uFH8LJ8tSI,6858
-SimpleRule34/aio/types.py,sha256=XvhZAYG7AzrT2iKRVlXGwS_EIqrn406vG7P2OnPfcx8,3713
-SimpleRule34/aio/utils.py,sha256=fWx-ntJ672NoktH5Ws9-FcO0gtCNVmd8VfxFxjWqsD0,616
-simple_rule34-0.1.5.4.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-simple_rule34-0.1.5.4.dist-info/METADATA,sha256=23_XOZltBacTOjrNr1vyGPLYGr7FwneROn_kRmEBaE4,2089
-simple_rule34-0.1.5.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simple_rule34-0.1.5.4.dist-info/top_level.txt,sha256=IrrcPxvAx-V0ikmhRaLYkjYt-hZ9SRGTcUdtAcbMzGE,13
-simple_rule34-0.1.5.4.dist-info/RECORD,,