pyaterochka-api 0.1.9__py3-none-any.whl → 0.2.0__py3-none-any.whl

pyaterochka_api/__init__.py

@@ -1,4 +1,5 @@
 from .manager import Pyaterochka
 from .enums import PurchaseMode
 
+__version__ = "0.2.0"
 __all__ = ['Pyaterochka', 'PurchaseMode']

pyaterochka_api/api.py

@@ -2,7 +2,9 @@ import aiohttp
 from fake_useragent import UserAgent
 from camoufox import AsyncCamoufox
 import logging
-from .tools import parse_proxy, parse_js, get_env_proxy
+from typing import Union, Optional
+from beartype import beartype
+from .tools import parse_proxy, get_env_proxy
 
 
 class PyaterochkaAPI:
@@ -10,16 +12,17 @@ class PyaterochkaAPI:
     Класс для загрузки JSON/image и парсинга JavaScript-конфигураций из удаленного источника.
     """
 
+    @beartype
     def __init__(self,
                  debug:             bool       = False,
                  proxy:             str | None = None,
                  autoclose_browser: bool       = False,
                  trust_env:         bool       = False,
                  timeout:           float      = 10.0
-        ):
+        ) -> None:
         self._debug = debug
         self._proxy = proxy
-        self._session = None
+        self._session: Optional[aiohttp.ClientSession] = None
         self._autoclose_browser = autoclose_browser
         self._browser = None
         self._bcontext = None
@@ -33,7 +36,8 @@ class PyaterochkaAPI:
         if not self._logger.hasHandlers():
             self._logger.addHandler(handler)
 
-    async def fetch(self, url: str) -> tuple[bool, dict | None | str, str]:
+    @beartype
+    async def fetch(self, url: str) -> tuple[bool, Union[dict, list[dict], bytes, str, None], str]:
         """
         Выполняет HTTP-запрос к указанному URL и возвращает результат.
 
@@ -63,26 +67,8 @@ class PyaterochkaAPI:
                 self._logger.error(f'Unexpected error: {response.status}')
                 raise Exception(f"Response status: {response.status} (unknown error/status code)")
 
-    async def download_config(self, config_url: str) -> dict | None:
-        """
-        Загружает и парсит JavaScript-конфигурацию с указанного URL.
-
-        :param config_url: URL для загрузки конфигурации.
-        :return: Распарсенные данные в виде словаря или None.
-        """
-        is_success, js_code, _response_type = await self.fetch(url=config_url)
-
-        if not is_success:
-            if self._debug:
-                self._logger.error('Failed to fetch JS code')
-            return None
-        elif self._debug:
-            self._logger.debug('JS code fetched successfully')
-
-        return await parse_js(js_code=js_code, debug=self._debug, logger=self._logger)
-
-
-    async def browser_fetch(self, url: str, selector: str, state: str = 'attached') -> dict:
+    @beartype
+    async def browser_fetch(self, url: str, selector: str, state: str = 'attached') -> str:
         if self._browser is None or self._bcontext is None:
             await self.new_session(include_aiohttp=False, include_browser=True)
 
@@ -97,6 +83,7 @@ class PyaterochkaAPI:
             await self.close(include_aiohttp=False, include_browser=True)
         return content
 
+    @beartype
     async def new_session(self, include_aiohttp: bool = True, include_browser: bool = False) -> None:
         await self.close(include_aiohttp=include_aiohttp, include_browser=include_browser)
 
@@ -129,6 +116,7 @@ class PyaterochkaAPI:
             self._bcontext = await self._browser.new_context()
             self._logger.info(f"A new browser context has been opened.")
 
+    @beartype
     async def close(
         self,
         include_aiohttp: bool = True,

pyaterochka_api/enums.py

@@ -1,11 +1,6 @@
 from enum import Enum
 
 class Patterns(Enum):
-    JS = r'\s*let\s+n\s*=\s*({.*});\s*'              # let n = {...};
-    STR = r'(\w+)\s*:\s*"([^"\\]*(?:\\.[^"\\]*)*)"'  # key: "value"
-    DICT = r'(\w+)\s*:\s*{(.*?)}'                    # key: {...}
-    LIST = r'(\w+)\s*:\s*\[([^\[\]]*(?:\[.*?\])*)\]' # key: [value]
-    FIND = r'\{.*?\}|\[.*?\]'                        # {} or []
     # http(s)://user:pass@host:port
     PROXY = r'^(?:(?P<scheme>https?:\/\/))?(?:(?P<username>[^:@]+):(?P<password>[^@]+)@)?(?P<host>[^:\/]+)(?::(?P<port>\d+))?$'
 

pyaterochka_api/manager.py

@@ -1,5 +1,4 @@
 from .api import PyaterochkaAPI
-from enum import Enum
 import re
 import json
 from io import BytesIO
@@ -263,17 +262,3 @@ class Pyaterochka:
         image.name = f'{url.split("/")[-1]}.{response_type.split("/")[-1]}'
 
         return image
-
-    @beartype
-    async def get_config(self) -> dict:
-        """
-        Asynchronously retrieves the configuration from the hardcoded JavaScript file.
-
-        Args:
-            debug (bool, optional): Whether to print debug information. Defaults to False.
-
-        Returns:
-            dict: A dictionary representing the configuration if the request is successful, error otherwise.
-        """
-
-        return await self.api.download_config(config_url=self.HARDCODE_JS_CONFIG)

pyaterochka_api/tools.py

@@ -1,8 +1,10 @@
 from .enums import Patterns
 import os
 import re
-from tqdm import tqdm
+from beartype import beartype
+import logging
 
+@beartype
 def get_env_proxy() -> str | None:
     """
     Получает прокси из переменных окружения.
@@ -11,7 +13,8 @@ def get_env_proxy() -> str | None:
     proxy = os.environ.get("HTTPS_PROXY") or os.environ.get("https_proxy") or os.environ.get("HTTP_PROXY") or os.environ.get("http_proxy")
     return proxy if proxy else None
 
-def parse_proxy(proxy_str: str | None, trust_env: bool, logger) -> dict | None:
+@beartype
+def parse_proxy(proxy_str: str | None, trust_env: bool, logger: logging.Logger) -> dict | None:
     logger.debug(f"Parsing proxy string: {proxy_str}")
 
     if not proxy_str:
@@ -53,69 +56,3 @@ def parse_proxy(proxy_str: str | None, trust_env: bool, logger) -> dict | None:
         
         logger.info(f"Proxy parsed as regex")
         return proxy_dict
-
-async def _parse_match(match: str, progress_bar: tqdm | None = None) -> dict:
-    result = {}
-
-    if progress_bar:
-        progress_bar.set_description("Parsing strings")
-
-    # Парсинг строк
-    string_matches = re.finditer(Patterns.STR.value, match)
-    for m in string_matches:
-        key, value = m.group(1), m.group(2)
-        result[key] = value.replace('\"', '"').replace('\\', '\\')
-
-    if progress_bar:
-        progress_bar.update(1)
-        progress_bar.set_description("Parsing dictionaries")
-
-    # Парсинг словарей
-    dict_matches = re.finditer(Patterns.DICT.value, match)
-    for m in dict_matches:
-        key, value = m.group(1), m.group(2)
-        if not re.search(Patterns.STR.value, value):
-            result[key] = await _parse_match(value, progress_bar)
-
-    if progress_bar:
-        progress_bar.update(1)
-        progress_bar.set_description("Parsing lists")
-
-    # Парсинг списков
-    list_matches = re.finditer(Patterns.LIST.value, match)
-    for m in list_matches:
-        key, value = m.group(1), m.group(2)
-        if not re.search(Patterns.STR.value, value):
-            result[key] = [await _parse_match(item.group(0), progress_bar) for item in re.finditer(Patterns.FIND.value, value)]
-
-    if progress_bar:
-        progress_bar.update(1)
-
-    return result
-
-async def parse_js(js_code: str, debug: bool, logger) -> dict | None:
-    """
-    Парсит JavaScript-код и извлекает данные из переменной "n".
-
-    :param js_code: JS-код в виде строки.
-    :return: Распарсенные данные в виде словаря или None.
-    """
-    matches = re.finditer(Patterns.JS.value, js_code)
-    match_list = list(matches)
-
-    logger.debug(f'Found matches {len(match_list)}')
-    
-    progress_bar = tqdm(total=33, desc="Parsing JS", position=0) if debug else None
-
-    if match_list and len(match_list) >= 1:
-        logger.info('Starting to parse match')
-        result = await _parse_match(match_list[1].group(0), progress_bar)
-        
-        if progress_bar:
-            progress_bar.close()
-        logger.info('Complited parsing match')
-        return result
-    else:
-        if progress_bar:
-            progress_bar.close()
-        raise Exception("N variable in JS code not found")

{pyaterochka_api-0.1.9.dist-info → pyaterochka_api-0.2.0.dist-info}/METADATA

@@ -1,15 +1,18 @@
 Metadata-Version: 2.4
 Name: pyaterochka_api
-Version: 0.1.9
+Version: 0.2.0
 Summary: A Python API client for Pyaterochka store catalog
-Home-page: https://github.com/Open-Inflation/pyaterochka_api
 Author: Miskler
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/Open-Inflation/pyaterochka_api
+Project-URL: Repository, https://github.com/Open-Inflation/pyaterochka_api
+Project-URL: Documentation, https://open-inflation.github.io/pyaterochka_api/
+Keywords: api,pyaterochka,store,catalog
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Intended Audience :: Developers
@@ -24,21 +27,11 @@ Requires-Dist: aiohttp
 Requires-Dist: camoufox[geoip]
 Requires-Dist: beartype
 Requires-Dist: fake-useragent
-Requires-Dist: tqdm
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-asyncio; extra == "tests"
 Requires-Dist: pytest-typed-schema-shot; extra == "tests"
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
 Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # Pyaterochka API *(not official / не официальный)*
 
@@ -116,10 +109,6 @@ async def main():
         news = await API.get_news(limit=5)
         print(f"News output: {news!s:.100s}...\n")
 
-        # RUS: Выводит основной конфиг сайта (очень долгая функция, рекомендую сохранять в файл и переиспользовать)
-        # ENG: Outputs the main config of the site (large function, recommend to save in a file and re-use it)
-        print(f"Main config: {await API.get_config()!s:.100s}...\n")
-
         # RUS: Если требуется, можно настроить вывод логов в консоль
         # ENG: If required, you can configure the output of logs in the console
         API.debug = True

pyaterochka_api-0.2.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+pyaterochka_api/__init__.py,sha256=-rsfMGZCT77fmjEHQi4cyyErAZrsQQdbuaqlbOt-a08,130
+pyaterochka_api/api.py,sha256=EsMsyNaFEWCif3iRK6GJCT1o4QHDY72rBgjfeu1BTSU,7204
+pyaterochka_api/enums.py,sha256=H864-J-1VWiEsRxNaGLAkcH2kq92FEj7fhuxwqfRVaw,285
+pyaterochka_api/manager.py,sha256=Wuugv3VuYOInyCBMfGyCCEn6lf4zdr3LwwZk1iT4R44,10261
+pyaterochka_api/tools.py,sha256=fxBa-FKJfbKmup2ZrDTF1u3qyawiHODjG9ofq5ZCG0w,2178
+pyaterochka_api-0.2.0.dist-info/licenses/LICENSE,sha256=Ee_P5XQUYoJuffzRL24j4GWpqgoWphUOKswpB2f9HcQ,1071
+pyaterochka_api-0.2.0.dist-info/METADATA,sha256=7-bQZJW9MFgReD8e2hX1x0p3nVN2YcGixP7PrrpZUQc,9432
+pyaterochka_api-0.2.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+pyaterochka_api-0.2.0.dist-info/top_level.txt,sha256=NTJa4yZBzfmC9B5FQuFETD9ngGd_KYZ3Hjfw_33aDTE,16
+pyaterochka_api-0.2.0.dist-info/RECORD,,

{pyaterochka_api-0.1.9.dist-info → pyaterochka_api-0.2.0.dist-info}/top_level.txt

@@ -1,2 +1 @@
 pyaterochka_api
-tests

pyaterochka_api-0.1.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-pyaterochka_api/__init__.py,sha256=6XnalFPUumYqDJFyXw2puejJ612o-D1tYjZ_IjQ7Hx0,108
-pyaterochka_api/api.py,sha256=KEr28n1aH69cVo0ztHCgB4ANVVZ-CezLWYTiPpfAmoc,7793
-pyaterochka_api/enums.py,sha256=JnX4JiHzXyRo4se8sCFx0LyqcKlXXED0VcA0xI7r_ZI,621
-pyaterochka_api/manager.py,sha256=yQw0njGCsropysT-_siuyNxXNpX-VJKOcVD8b-aV48I,10765
-pyaterochka_api/tools.py,sha256=xFOThNRClX4u0cMfmQ5fVQKLM2Fn-rBAekzo_yBvRnQ,4447
-pyaterochka_api-0.1.9.dist-info/licenses/LICENSE,sha256=Ee_P5XQUYoJuffzRL24j4GWpqgoWphUOKswpB2f9HcQ,1071
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/api_tests.py,sha256=Sx2tAVGLbubpzJOn166ECJj64oYUv1S6c5fYfGLGvu0,2227
-tests/tools_tests.py,sha256=UKWVHu-QkEzc7iLsm5wIhA17FLq3E7SxwkLHc5GEI2M,1040
-pyaterochka_api-0.1.9.dist-info/METADATA,sha256=nUC4TfS_mT1VQ2MZLKNpLM4YF1ZfvaZ33bqOHhimHZk,9855
-pyaterochka_api-0.1.9.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-pyaterochka_api-0.1.9.dist-info/top_level.txt,sha256=PXTSi8y2C5_Mz20pJJFqOUBnjAIAXP_cc38mthvJ2x4,22
-pyaterochka_api-0.1.9.dist-info/RECORD,,

tests/api_tests.py

@@ -1,57 +0,0 @@
-import pytest
-from pyaterochka_api import Pyaterochka
-from io import BytesIO
-from typed_schema_shot import SchemaShot
-
-
-@pytest.mark.asyncio
-async def test_list(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True, trust_env=True) as API:
-        categories = await API.categories_list(subcategories=True)
-        schemashot.assert_match(categories, "categories_list")
-
-        result = await API.products_list(category_id=categories[0]['id'], limit=5)
-        schemashot.assert_match(result, "products_list")
-
-@pytest.mark.asyncio
-async def test_product_info(schemashot: SchemaShot):
-    async with Pyaterochka(trust_env=True) as API:
-        result = await API.product_info(43347)
-        schemashot.assert_match(result, "product_info")
-
-@pytest.mark.asyncio
-async def test_get_news(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True, trust_env=True) as API:
-        result = await API.get_news(limit=5)
-        schemashot.assert_match(result, "get_news")
-
-@pytest.mark.asyncio
-async def test_find_store(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True, trust_env=True) as API:
-        categories = await API.find_store(longitude=37.63156, latitude=55.73768)
-        schemashot.assert_match(categories, "store_info")
-
-@pytest.mark.asyncio
-async def test_download_image(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True, trust_env=True) as API:
-        result = await API.download_image("https://photos.okolo.app/product/1392827-main/800x800.jpeg")
-        assert isinstance(result, BytesIO)
-        assert result.getvalue()
-
-@pytest.mark.asyncio
-async def test_set_debug(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True) as API:
-        assert API.debug == True
-        API.debug = False
-        assert API.debug == False
-
-@pytest.mark.asyncio
-async def test_rebuild_connection(schemashot: SchemaShot):
-    async with Pyaterochka(debug=True, trust_env=True) as API:
-        await API.rebuild_connection()
-
-#@pytest.mark.asyncio
-#async def test_get_config(snapshot: SnapshotTest):
-#    async with Pyaterochka(debug=True, trust_env=True, timeout=30) as API:
-#        result = await API.get_config()
-#        snapshot.assert_match(gen_schema(result), "get_config")

tests/tools_tests.py

@@ -1,30 +0,0 @@
-import pytest
-from pyaterochka_api.tools import parse_proxy
-import itertools
-import logging
-
-@pytest.mark.asyncio
-async def test_parse_proxy():
-    # Варианты параметров
-    schemes = ['http://', 'https://', '']
-    auths = [('', ''), ('user', 'pass')]
-    hosts = ['127.0.0.1', 'example.com']
-    ports = ['', '8080']
-
-    logger = logging.getLogger("test_parse_proxy")
-
-    for scheme, (username, password), host, port in itertools.product(schemes, auths, hosts, ports):
-        # Формируем строку прокси
-        auth_part = f"{username}:{password}@" if username else ""
-        port_part = f":{port}" if port else ""
-        proxy_str = f"{scheme}{auth_part}{host}{port_part}"
-
-        expected = {'server': f"{scheme}{host}{port_part}"}
-        if not scheme:
-            expected['server'] = "http://"+expected['server']
-        if username:
-            expected['username'] = username
-            expected['password'] = password
-
-        assert parse_proxy(proxy_str, True, logger) == expected
-