majorchik-api 0.0.4__tar.gz → 0.0.4.2__tar.gz

{majorchik_api-0.0.4 → majorchik_api-0.0.4.2}/PKG-INFO

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

{majorchik_api-0.0.4 → majorchik_api-0.0.4.2}/pyproject.toml

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

{majorchik_api-0.0.4 → majorchik_api-0.0.4.2}/src/browser_ai/base_api.py

@@ -54,6 +54,7 @@ class BaseWebAPI(ABC):
                 raise Exception("Не удалось найти Google Chrome в системе. Установите его для авторизации.")
             
             os.makedirs(self.profile_dir, exist_ok=True)
+            self._clean_exit_state()
             self.process = subprocess.Popen([
                 chrome_path,
                 f"--user-data-dir={self.profile_dir}",
@@ -81,6 +82,8 @@ class BaseWebAPI(ABC):
         if self.disable_images:
             args.append("--blink-settings=imagesEnabled=false")
             
+        self._clean_exit_state()
+            
         try:
             self.browser = self.playwright.chromium.launch_persistent_context(
                 user_data_dir=self.profile_dir,
@@ -133,12 +136,22 @@ class BaseWebAPI(ABC):
         if hasattr(self, 'process') and self.process:
             try:
                 import sys
+                import subprocess
                 if sys.platform == "win32":
-                    import subprocess
-                    subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    # Мягкое закрытие окна
+                    subprocess.call(["taskkill", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                 else:
                     self.process.terminate()
-                    self.process.wait(timeout=3)
+                
+                try:
+                    # Ждем до 5 секунд, пока браузер корректно сохранит данные и закроется
+                    self.process.wait(timeout=5)
+                except subprocess.TimeoutExpired:
+                    # Если завис, убиваем принудительно
+                    if sys.platform == "win32":
+                        subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    else:
+                        self.process.kill()
             except:
                 pass
             self.process = None
@@ -151,3 +164,33 @@ class BaseWebAPI(ABC):
             try: self.playwright.stop()
             except: pass
             self.playwright = None
+
+    def _clean_exit_state(self):
+        """Сбрасывает статус краша в файле Preferences профиля, чтобы избежать окна 'Восстановить страницы?'."""
+        import json
+        
+        pref_paths = [
+            os.path.join(self.profile_dir, "Default", "Preferences"),
+            os.path.join(self.profile_dir, "Preferences")
+        ]
+        
+        for pref_path in pref_paths:
+            if os.path.exists(pref_path):
+                try:
+                    with open(pref_path, 'r', encoding='utf-8') as f:
+                        data = json.load(f)
+                    
+                    changed = False
+                    if "profile" in data:
+                        if data["profile"].get("exit_type") != "Normal":
+                            data["profile"]["exit_type"] = "Normal"
+                            changed = True
+                        if not data["profile"].get("exited_cleanly", True):
+                            data["profile"]["exited_cleanly"] = True
+                            changed = True
+                            
+                    if changed:
+                        with open(pref_path, 'w', encoding='utf-8') as f:
+                            json.dump(data, f)
+                except Exception:
+                    pass

{majorchik_api-0.0.4 → majorchik_api-0.0.4.2}/src/browser_ai/google_ai_studio_api.py

@@ -53,6 +53,7 @@ class GoogleAIStudioAPI(BaseWebAPI):
                 raise Exception("Не удалось найти Google Chrome в системе. Установите его для авторизации.")
             
             os.makedirs(self.profile_dir, exist_ok=True)
+            self._clean_exit_state()
             self.process = subprocess.Popen([
                 chrome_path,
                 f"--user-data-dir={self.profile_dir}",
@@ -71,12 +72,19 @@ class GoogleAIStudioAPI(BaseWebAPI):
         if hasattr(self, 'process') and self.process:
             try:
                 import sys
+                import subprocess
                 if sys.platform == "win32":
-                    import subprocess
-                    subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    subprocess.call(["taskkill", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                 else:
                     self.process.terminate()
-                    self.process.wait(timeout=3)
+                
+                try:
+                    self.process.wait(timeout=5)
+                except subprocess.TimeoutExpired:
+                    if sys.platform == "win32":
+                        subprocess.call(["taskkill", "/F", "/T", "/PID", str(self.process.pid)], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    else:
+                        self.process.kill()
             except:
                 pass
             self.process = None

{majorchik_api-0.0.4 → majorchik_api-0.0.4.2}/src/majorchik_api.egg-info/PKG-INFO

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