adspower 2.0.2__tar.gz → 2.0.3__tar.gz

{adspower-2.0.2 → adspower-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: adspower
-Version: 2.0.2
+Version: 2.0.3
 Summary: The package for interacting with API of anti-detect browser AdsPower.
 Home-page: https://github.com/blnkoff/adspower
 License: MIT
@@ -27,7 +27,14 @@ Description-Content-Type: text/markdown
 
 # adspower
 
-[![Croco Logo](https://i.ibb.co/G5Pjt6M/logo.png)](https://t.me/crocofactory)<a href="https://www.adspower.com"><img height="35" src="https://www.adspower.com/dist/logo_global.png"></a>
+[![Croco Logo](https://i.ibb.co/G5Pjt6M/logo.png)](https://t.me/crocofactory) <a href="https://www.adspower.com"><img height="35" src="https://www.adspower.com/dist/logo_global.png"></a>
+
+[![PyPi Version](https://img.shields.io/pypi/v/adspower)](https://pypi.org/project/adspower/)
+[![PyPI Downloads](https://img.shields.io/pypi/dm/adspower?label=downloads)](https://pypi.org/project/adspower/)
+[![License](https://img.shields.io/github/license/blnkoff/adspower.svg)](https://pypi.org/project/adspower/)
+[![Last Commit](https://img.shields.io/github/last-commit/blnkoff/adspower.svg)](https://pypi.org/project/adspower/)
+[![Development Status](https://img.shields.io/pypi/status/adspower)](https://pypi.org/project/adspower/) 
+
 
 The package for interacting with API of anti-detect browser [AdsPower](https://www.adspower.com).
 

{adspower-2.0.2 → adspower-2.0.3}/README.md

@@ -1,6 +1,13 @@
 # adspower
 
-[![Croco Logo](https://i.ibb.co/G5Pjt6M/logo.png)](https://t.me/crocofactory)<a href="https://www.adspower.com"><img height="35" src="https://www.adspower.com/dist/logo_global.png"></a>
+[![Croco Logo](https://i.ibb.co/G5Pjt6M/logo.png)](https://t.me/crocofactory) <a href="https://www.adspower.com"><img height="35" src="https://www.adspower.com/dist/logo_global.png"></a>
+
+[![PyPi Version](https://img.shields.io/pypi/v/adspower)](https://pypi.org/project/adspower/)
+[![PyPI Downloads](https://img.shields.io/pypi/dm/adspower?label=downloads)](https://pypi.org/project/adspower/)
+[![License](https://img.shields.io/github/license/blnkoff/adspower.svg)](https://pypi.org/project/adspower/)
+[![Last Commit](https://img.shields.io/github/last-commit/blnkoff/adspower.svg)](https://pypi.org/project/adspower/)
+[![Development Status](https://img.shields.io/pypi/status/adspower)](https://pypi.org/project/adspower/) 
+
 
 The package for interacting with API of anti-detect browser [AdsPower](https://www.adspower.com).
 

{adspower-2.0.2 → adspower-2.0.3}/adspower/async_api/_base_profile.py

@@ -38,7 +38,6 @@ class _BaseProfile(ProfileAPI, ABC):
             clear_cache_after_closing: bool = False,
             enable_password_saving: bool = False,
             close_tabs: bool = True,
-            start_maximized: bool = True
     ):
         pass
 

{adspower-2.0.2 → adspower-2.0.3}/adspower/async_api/playwright/profile.py

@@ -88,8 +88,7 @@ class Profile(_BaseProfile):
             disable_password_filling: bool = False,
             clear_cache_after_closing: bool = False,
             enable_password_saving: bool = False,
-            close_tabs: bool = True,
-            start_maximized: bool = True
+            close_tabs: bool = True
     ) -> BrowserContext:
         """
         Get a BrowserContext connected to the profile
@@ -102,7 +101,6 @@ class Profile(_BaseProfile):
         :param clear_cache_after_closing: Whether to delete the cache after closing the browser
         :param enable_password_saving: Whether to allow password saving
         :param close_tabs: Whether to close all startup tabs
-        :param start_maximized: Whether to enable maximized window size at start
         :return: BrowserContext instance
         """
         response = await self._get_browser(

{adspower-2.0.2 → adspower-2.0.3}/adspower/async_api/profile_api.py

@@ -144,13 +144,27 @@ class ProfileAPI(_BaseProfileAPI, ABC):
         :return: A Profile instance
         """
         http_client = cls._client
-        args, handler = cls._create(group,
-                                    name,
-                                    domain_name,
-                                    open_urls,
-                                    repeat_config,
-                                    username,
-                                    password)
+        args, handler = cls._create(
+            group,
+            name,
+            domain_name,
+            open_urls,
+            repeat_config,
+            username,
+            password,
+            fakey,
+            cookies,
+            ignore_cookie_error,
+            ip,
+            ip_country,
+            region,
+            city,
+            remark,
+            ip_checker,
+            category,
+            proxy_config,
+            fingerprint_config
+        )
 
         async with http_client() as client:
             response = (await client.post(**args)).json()['data']
@@ -182,7 +196,15 @@ class ProfileAPI(_BaseProfileAPI, ABC):
         :return: List of profiles
         """
         http_client = cls._client
-        args, handler = cls._query(group, id_, name, serial_number, user_sort, page, page_size)
+        args, handler = cls._query(
+            group,
+            id_,
+            name,
+            serial_number,
+            user_sort,
+            page,
+            page_size
+        )
 
         async with http_client() as client:
             response = (await client.get(**args)).json()['data']
@@ -213,7 +235,15 @@ class ProfileAPI(_BaseProfileAPI, ABC):
     ) -> BrowserResponse:
         http_client = self._client
 
-        args, handler = super()._get_browser(ip_tab, new_first_tab, launch_args)
+        args, handler = super()._get_browser(
+            ip_tab,
+            new_first_tab,
+            launch_args,
+            headless,
+            disable_password_filling,
+            clear_cache_after_closing,
+            enable_password_saving
+        )
         async with http_client() as client:
             response = (await client.get(**args)).json()['data']
 
@@ -262,9 +292,24 @@ class ProfileAPI(_BaseProfileAPI, ABC):
         :param fingerprint_config: Dictionary containing fingerprint info
         """
         http_client = self._client
-        args, handler = self._update(name, domain_name, open_urls, username, password, fakey, cookies,
-                                     ignore_cookie_error, ip, ip_country, region, city, remark, category,
-                                     proxy_config, fingerprint_config)
+        args, handler = self._update(
+            name,
+            domain_name,
+            open_urls,
+            username,
+            password,
+            fakey,
+            cookies,
+            ignore_cookie_error,
+            ip,
+            ip_country,
+            region,
+            city,
+            remark,
+            category,
+            proxy_config,
+            fingerprint_config
+        )
 
         async with http_client() as client:
             (await client.post(**args))

{adspower-2.0.2 → adspower-2.0.3}/adspower/async_api/selenium/profile.py

@@ -122,14 +122,16 @@ class Profile(_BaseProfile):
 
         options.add_experimental_option('debuggerAddress', debugger_address)
         options.page_load_strategy = 'none'
-        options.add_argument('--headless=new')
 
-        if start_maximized:
-            options.add_argument("--start-maximized")
+        if not headless:
+            options.add_argument('--headless=new')
 
         service = Service(executable_path=chrome_driver)
         browser = self._browser = WebDriver(service=service, options=options)
 
+        if start_maximized:
+            browser.maximize_window()
+
         if close_tabs:
             self.close_tabs()
 

{adspower-2.0.2 → adspower-2.0.3}/adspower/sync_api/_base_profile.py

@@ -37,8 +37,7 @@ class _BaseProfile(ProfileAPI, ABC):
             disable_password_filling: bool = False,
             clear_cache_after_closing: bool = False,
             enable_password_saving: bool = False,
-            close_tabs: bool = True,
-            start_maximized: bool = True
+            close_tabs: bool = True
     ):
         pass
 

{adspower-2.0.2 → adspower-2.0.3}/adspower/sync_api/playwright/profile.py

@@ -89,7 +89,6 @@ class Profile(_BaseProfile):
             clear_cache_after_closing: bool = False,
             enable_password_saving: bool = False,
             close_tabs: bool = True,
-            start_maximized: bool = True
     ) -> BrowserContext:
         """
         Get a BrowserContext connected to the profile
@@ -102,7 +101,6 @@ class Profile(_BaseProfile):
         :param clear_cache_after_closing: Whether to delete the cache after closing the browser
         :param enable_password_saving: Whether to allow password saving
         :param close_tabs: Whether to close all startup tabs
-        :param start_maximized: Whether to enable maximized window size at start
         :return: BrowserContext instance
         """
         response = self._get_browser(

{adspower-2.0.2 → adspower-2.0.3}/adspower/sync_api/profile_api.py

@@ -196,7 +196,15 @@ class ProfileAPI(_BaseProfileAPI):
         :return: List of profiles
         """
         http_client = cls._client
-        args, handler = cls._query(group, id_, name, serial_number, user_sort, page, page_size)
+        args, handler = cls._query(
+            group,
+            id_,
+            name,
+            serial_number,
+            user_sort,
+            page,
+            page_size
+        )
 
         with http_client() as client:
             response = client.get(**args).json()['data']
@@ -227,7 +235,16 @@ class ProfileAPI(_BaseProfileAPI):
     ) -> BrowserResponse:
         http_client = self._client
 
-        args, handler = super()._get_browser(ip_tab, new_first_tab, launch_args)
+        args, handler = super()._get_browser(
+            ip_tab,
+            new_first_tab,
+            launch_args,
+            headless,
+            disable_password_filling,
+            clear_cache_after_closing,
+            enable_password_saving
+        )
+
         with http_client() as client:
             response = client.get(**args).json()['data']
 

{adspower-2.0.2 → adspower-2.0.3}/adspower/sync_api/selenium/profile.py

@@ -124,12 +124,15 @@ class Profile(_BaseProfile):
         options.page_load_strategy = 'none'
         options.add_argument('--headless=new')
 
-        if start_maximized:
-            options.add_argument("--start-maximized")
+        if not headless:
+            options.add_argument('--headless=new')
 
         service = Service(executable_path=chrome_driver)
         browser = self._browser = WebDriver(service=service, options=options)
 
+        if start_maximized:
+            browser.maximize_window()
+
         if close_tabs:
             self.close_tabs()
 

adspower-2.0.3/adspower/utils.py

@@ -0,0 +1,69 @@
+import ctypes
+import platform
+import subprocess
+from typing import TypeVar
+
+_KT = TypeVar('_KT')
+_VT = TypeVar('_VT')
+
+
+def _convert_json(data: dict[_KT, _VT]) -> dict[_KT, _VT]:
+    """
+    Convert string representations of numbers to actual numeric types within a dictionary and convert
+    empty strings to None.
+
+    :param data: A dictionary containing various key-value pairs.
+    :return: A dictionary with string representations of numbers converted to their actual numeric types.
+    """
+    for key, value in data.items():
+        if isinstance(value, str) and value.isdigit():
+            data[key] = int(value)
+        elif isinstance(value, str) and _is_float(value):
+            data[key] = float(value)
+        elif isinstance(value, str) and not len(value):
+            data[key] = None
+    return data
+
+
+def _is_float(__str: str) -> bool:
+    """
+    Check if a string represents a floating-point number.
+
+    :param __str: A string to check.
+    :return: True if the string represents a floating-point number, False otherwise.
+    """
+    try:
+        float(__str)
+        return True
+    except ValueError:
+        return False
+
+
+def _get_screen_size() -> tuple[int, int]:
+    os_name = platform.system()
+    if os_name == "Windows":
+        h = ctypes.windll.user32.GetDC(0)
+        width = ctypes.windll.gdi32.GetDeviceCaps(h, 118)
+        height = ctypes.windll.gdi32.GetDeviceCaps(h, 117)
+        ctypes.windll.user32.ReleaseDC(0, h)
+        return width, height
+
+    elif os_name == "Darwin":
+        output = subprocess.run(['system_profiler', 'SPDisplaysDataType'], capture_output=True, text=True).stdout
+        for line in output.split('\n'):
+            if 'Resolution' in line:
+                parts = line.split()
+                width = int(parts[1])
+                height = int(parts[3])
+                return width, height
+
+    elif os_name == "Linux":
+        output = subprocess.run(['xrandr'], capture_output=True, text=True).stdout
+        for line in output.split('\n'):
+            if '*' in line:
+                resolution = line.split()[0]
+                width, height = map(int, resolution.split('x'))
+                return width, height
+
+    else:
+        raise NotImplementedError(f"OS {os_name} not supported")

{adspower-2.0.2 → adspower-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'adspower'
-version = '2.0.2'
+version = '2.0.3'
 description = 'The package for interacting with API of anti-detect browser AdsPower.'
 authors = ['Alexey <axbelenkov@gmail.com>']
 license = 'MIT'

adspower-2.0.2/adspower/utils.py

@@ -1,36 +0,0 @@
-from typing import TypeVar
-
-_KT = TypeVar('_KT')
-_VT = TypeVar('_VT')
-
-
-def _convert_json(data: dict[_KT, _VT]) -> dict[_KT, _VT]:
-    """
-    Convert string representations of numbers to actual numeric types within a dictionary and convert
-    empty strings to None.
-
-    :param data: A dictionary containing various key-value pairs.
-    :return: A dictionary with string representations of numbers converted to their actual numeric types.
-    """
-    for key, value in data.items():
-        if isinstance(value, str) and value.isdigit():
-            data[key] = int(value)
-        elif isinstance(value, str) and _is_float(value):
-            data[key] = float(value)
-        elif isinstance(value, str) and not len(value):
-            data[key] = None
-    return data
-
-
-def _is_float(__str: str) -> bool:
-    """
-    Check if a string represents a floating-point number.
-
-    :param __str: A string to check.
-    :return: True if the string represents a floating-point number, False otherwise.
-    """
-    try:
-        float(__str)
-        return True
-    except ValueError:
-        return False