majorchik-api 0.0.3.2__tar.gz → 0.0.3.4__tar.gz

{majorchik_api-0.0.3.2 → majorchik_api-0.0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majorchik-api
-Version: 0.0.3.2
+Version: 0.0.3.4
 Summary: Пакет для взаимодействия с современными нейросетями (Gemini, DeepSeek) через автоматизацию браузера
 Author-email: GO Software <gosoftware2025@gmail.com>
 Requires-Python: >=3.8

{majorchik_api-0.0.3.2 → majorchik_api-0.0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "majorchik-api"
-version = "0.0.3.2"
+version = "0.0.3.4"
 authors = [
     {name = "GO Software", email = "gosoftware2025@gmail.com"},
 ]

{majorchik_api-0.0.3.2 → majorchik_api-0.0.3.4}/src/browser_ai/base_api.py

@@ -28,6 +28,46 @@ class BaseWebAPI(ABC):
     def _start_browser(self, headless: bool):
         self.close()
         self.headless = headless
+        
+        if getattr(self, 'setup_mode', False):
+            import subprocess, sys, shutil
+            chrome_path = None
+            if sys.platform == "win32":
+                paths = [
+                    r"C:\Program Files\Google\Chrome\Application\chrome.exe",
+                    r"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe",
+                    os.path.expandvars(r"%LOCALAPPDATA%\Google\Chrome\Application\chrome.exe")
+                ]
+                for p in paths:
+                    if os.path.exists(p):
+                        chrome_path = p
+                        break
+            elif sys.platform == "darwin":
+                chrome_path = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            else:
+                for name in ["google-chrome", "google-chrome-stable", "chromium-browser", "chromium"]:
+                    if shutil.which(name):
+                        chrome_path = name
+                        break
+                        
+            if not chrome_path:
+                raise Exception("Не удалось найти Google Chrome в системе. Установите его для авторизации.")
+            
+            import os
+            os.makedirs(self.profile_dir, exist_ok=True)
+            self.process = subprocess.Popen([
+                chrome_path,
+                f"--user-data-dir={self.profile_dir}",
+                "--no-first-run",
+                "--no-default-browser-check",
+                self.url
+            ])
+            self.headless = False
+            self.browser = None
+            self.playwright = None
+            self.page = None
+            return
+
         self.playwright = sync_playwright().start()
         
         args =[
@@ -85,6 +125,19 @@ class BaseWebAPI(ABC):
         pass
 
     def close(self):
+        if hasattr(self, 'process') and self.process:
+            try:
+                import sys
+                if sys.platform == "win32":
+                    import subprocess
+                    subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                else:
+                    self.process.terminate()
+                    self.process.wait(timeout=3)
+            except:
+                pass
+            self.process = None
+
         if hasattr(self, 'browser') and self.browser:
             try: self.browser.close()
             except: pass

{majorchik_api-0.0.3.2 → majorchik_api-0.0.3.4}/src/browser_ai/google_ai_studio_api.py

@@ -22,10 +22,65 @@ class GoogleAIStudioAPI(BaseWebAPI):
             headless=headless,
             disable_images=disable_images,
             setup_mode=setup_mode,
-            apply_stealth=False,  # Отключаем stealth, так как он ломает фронтенд Google AI Studio
+            apply_stealth=False,
             **kwargs
         )
 
+    def _start_browser(self, headless: bool):
+        if getattr(self, 'setup_mode', False):
+            import subprocess, sys, shutil, os
+            chrome_path = None
+            if sys.platform == "win32":
+                paths = [
+                    r"C:\Program Files\Google\Chrome\Application\chrome.exe",
+                    r"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe",
+                    os.path.expandvars(r"%LOCALAPPDATA%\Google\Chrome\Application\chrome.exe")
+                ]
+                for p in paths:
+                    if os.path.exists(p):
+                        chrome_path = p
+                        break
+            elif sys.platform == "darwin":
+                chrome_path = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            else:
+                for name in ["google-chrome", "google-chrome-stable", "chromium-browser", "chromium"]:
+                    if shutil.which(name):
+                        chrome_path = name
+                        break
+                        
+            if not chrome_path:
+                raise Exception("Не удалось найти Google Chrome в системе. Установите его для авторизации.")
+            
+            os.makedirs(self.profile_dir, exist_ok=True)
+            self.process = subprocess.Popen([
+                chrome_path,
+                f"--user-data-dir={self.profile_dir}",
+                "--no-first-run",
+                "--no-default-browser-check",
+                self.url
+            ])
+            self.headless = False
+            self.browser = None
+            self.playwright = None
+            self.page = None
+        else:
+            super()._start_browser(headless)
+
+    def close(self):
+        if hasattr(self, 'process') and self.process:
+            try:
+                import sys
+                if sys.platform == "win32":
+                    import subprocess
+                    subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                else:
+                    self.process.terminate()
+                    self.process.wait(timeout=3)
+            except:
+                pass
+            self.process = None
+        super().close()
+
     def wait_for_ready(self):
         for _ in range(30):
             if "accounts.google.com" in self.page.url or "signin" in self.page.url.lower():

{majorchik_api-0.0.3.2 → majorchik_api-0.0.3.4}/src/majorchik_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majorchik-api
-Version: 0.0.3.2
+Version: 0.0.3.4
 Summary: Пакет для взаимодействия с современными нейросетями (Gemini, DeepSeek) через автоматизацию браузера
 Author-email: GO Software <gosoftware2025@gmail.com>
 Requires-Python: >=3.8