hh-applicant-tool 0.5.7__py3-none-any.whl → 0.5.9__py3-none-any.whl

hh_applicant_tool/operations/authorize.py

@@ -1,6 +1,5 @@
 import argparse
 import logging
-import time
 from urllib.parse import parse_qs, urlsplit
 import sys
 from typing import Any
@@ -35,9 +34,8 @@ except ImportError:
         pass
 
 
-from ..api import OAuthClient
-from ..main import BaseOperation, Namespace
-from ..utils import Config
+from ..api import ApiClient  # noqa: E402
+from ..main import BaseOperation, Namespace  # noqa: E402
 
 logger = logging.getLogger(__package__)
 
@@ -54,10 +52,9 @@ class HHAndroidUrlSchemeHandler(QWebEngineUrlSchemeHandler):
 
 
 class WebViewWindow(QMainWindow):
-    def __init__(self, url: str, oauth_client: OAuthClient, config: Config) -> None:
+    def __init__(self, api_client: ApiClient) -> None:
         super().__init__()
-        self.oauth_client = oauth_client
-        self.config = config
+        self.api_client = api_client
         # Настройка WebEngineView
         self.web_view = QWebEngineView()
         self.setCentralWidget(self.web_view)
@@ -68,16 +65,15 @@ class WebViewWindow(QMainWindow):
         profile.installUrlSchemeHandler(b"hhandroid", self.hhandroid_handler)
         # Настройки окна для мобильного вида
         self.resize(480, 800)
-        self.web_view.setUrl(QUrl(url))
+        self.web_view.setUrl(QUrl(api_client.oauth_client.authorize_url))
 
     def handle_redirect_uri(self, redirect_uri: str) -> None:
         logger.debug(f"handle redirect uri: {redirect_uri}")
         sp = urlsplit(redirect_uri)
         code = parse_qs(sp.query).get("code", [None])[0]
         if code:
-            token = self.oauth_client.authenticate(code)
-            logger.debug("Сохраняем токен")
-            self.config.save(token=dict(token, created_at=int(time.time())))
+            token = self.api_client.oauth_client.authenticate(code)
+            self.api_client.handle_access_token(token)
             print("🔓 Авторизация прошла успешно!")
             self.close()
 
@@ -88,21 +84,15 @@ class Operation(BaseOperation):
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         pass
 
-    def run(self, args: Namespace) -> None:
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
         if not QT_IMPORTED:
             print_err(
                 "❗Критиническая Ошибка: PyQt6 не был импортирован, возможно, вы долбоеб и забыли его установить, либо же криворукие разрабы этой либы опять все сломали..."
             )
             sys.exit(1)
 
-        oauth = OAuthClient(
-            user_agent=(args.config["oauth_user_agent"] or args.config["user_agent"]),
-        )
-
         app = QApplication(sys.argv)
-        window = WebViewWindow(
-            oauth.authorize_url, oauth_client=oauth, config=args.config
-        )
+        window = WebViewWindow(api_client=api_client)
         window.show()
 
         app.exec()

hh_applicant_tool/operations/call_api.py

@@ -4,8 +4,8 @@ import json
 import logging
 import sys
 
-from ..api import ApiError
-from ..main import BaseOperation, get_api
+from ..api import ApiError, ApiClient
+from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
 
 logger = logging.getLogger(__package__)
@@ -22,23 +22,22 @@ class Operation(BaseOperation):
     """Вызвать произвольный метод API <https://github.com/hhru/api>."""
 
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
-        parser.add_argument("endpoint")
+        parser.add_argument("endpoint", help="Путь до эндпоинта API")
         parser.add_argument(
             "param",
             nargs="*",
-            help="PARAM=VALUE",
+            help="Параметры указываются в виде PARAM=VALUE",
             default=[],
         )
         parser.add_argument(
             "-m", "--method", "--meth", default="GET", help="HTTP Метод"
         )
 
-    def run(self, args: Namespace) -> None:
-        api = get_api(args)
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
         params = dict(x.split("=", 1) for x in args.param)
         try:
-            result = api.request(args.method, args.endpoint, params=params)
-            print(json.dumps(result, ensure_ascii=True))
+            result = api_client.request(args.method, args.endpoint, params=params)
+            print(json.dumps(result, ensure_ascii=False))
         except ApiError as ex:
-            json.dump(ex.data, sys.stderr, ensure_ascii=True)
+            json.dump(ex.data, sys.stderr, ensure_ascii=False)
             return 1

hh_applicant_tool/operations/clear_negotiations.py

@@ -7,7 +7,6 @@ from ..api import ApiClient, ClientError
 from ..constants import INVALID_ISO8601_FORMAT
 from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
-from ..main import get_api
 from ..types import ApiListResponse
 from ..utils import print_err, truncate_string
 
@@ -44,12 +43,12 @@ class Operation(BaseOperation):
             action=argparse.BooleanOptionalAction,
         )
 
-    def _get_active_negotiations(self, api: ApiClient) -> list[dict]:
+    def _get_active_negotiations(self, api_client: ApiClient) -> list[dict]:
         rv = []
         page = 0
         per_page = 100
         while True:
-            r: ApiListResponse = api.get(
+            r: ApiListResponse = api_client.get(
                 "/negotiations", page=page, per_page=per_page, status="active"
             )
             rv.extend(r["items"])
@@ -58,9 +57,8 @@ class Operation(BaseOperation):
                 break
         return rv
 
-    def run(self, args: Namespace) -> None:
-        api = get_api(args)
-        negotiations = self._get_active_negotiations(api)
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
+        negotiations = self._get_active_negotiations(api_client)
         print("Всего активных:", len(negotiations))
         for item in negotiations:
             state = item["state"]
@@ -69,20 +67,18 @@ class Operation(BaseOperation):
             # hidden True
             is_discard = state["id"] == "discard"
             if not item["hidden"] and (
-                args.all 
+                args.all
                 or is_discard
                 or (
                     state["id"] == "response"
-                    and (
-                        datetime.utcnow() - timedelta(days=args.older_than)
-                    ).replace(tzinfo=timezone.utc)
-                    > datetime.strptime(
-                        item["updated_at"], INVALID_ISO8601_FORMAT
+                    and (datetime.utcnow() - timedelta(days=args.older_than)).replace(
+                        tzinfo=timezone.utc
                     )
+                    > datetime.strptime(item["updated_at"], INVALID_ISO8601_FORMAT)
                 )
             ):
                 decline_allowed = item.get("decline_allowed") or False
-                r = api.delete(
+                r = api_client.delete(
                     f"/negotiations/active/{item['id']}",
                     with_decline_message=decline_allowed,
                 )
@@ -99,7 +95,7 @@ class Operation(BaseOperation):
                 if is_discard and args.blacklist_discard:
                     employer = vacancy["employer"]
                     try:
-                        r = api.put(f"/employers/blacklisted/{employer['id']}")
+                        r = api_client.put(f"/employers/blacklisted/{employer['id']}")
                         assert not r
                         print(
                             "🚫 Заблокировали",

hh_applicant_tool/operations/config.py

@@ -2,6 +2,7 @@ import argparse
 import logging
 import os
 import subprocess
+from typing import Any
 
 from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
@@ -12,25 +13,39 @@ EDITOR = os.getenv("EDITOR", "nano")
 
 
 class Namespace(BaseNamespace):
-    print: bool
+    show_path: bool
+    key: str
+
+
+def get_value(data: dict[str, Any], path: str) -> Any:
+    for key in path.split("."):
+        if key not in data:
+            return None
+        data = data[key]
+    return data
 
 
 class Operation(BaseOperation):
-    """Редактировать конфигурационный файл или показать путь до него"""
+    """Операции с конфигурационным файлом"""
 
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         parser.add_argument(
             "-p",
-            "--print",
+            "--show-path",
+            "--path",
             type=bool,
             default=False,
             action=argparse.BooleanOptionalAction,
-            help="Напечатать путь и выйти",
+            help="Вывести полный путь к конфигу",
         )
+        parser.add_argument("-k", "--key", help="Вывести отдельное значение из конфига")
 
-    def run(self, args: Namespace) -> None:
+    def run(self, args: Namespace, *_) -> None:
+        if args.key:
+            print(get_value(args.config, args.key))
+            return
         config_path = str(args.config._config_path)
-        if args.print:
+        if args.show_path:
             print(config_path)
         else:
             subprocess.call([EDITOR, config_path])

hh_applicant_tool/operations/delete_telemetry.py

@@ -0,0 +1,30 @@
+# Этот модуль можно использовать как образец для других
+import argparse
+import logging
+
+from ..telemetry_client import TelemetryClient, TelemetryError
+
+from ..main import BaseOperation
+from ..main import Namespace as BaseNamespace
+from ..utils import print_err
+
+logger = logging.getLogger(__package__)
+
+
+class Namespace(BaseNamespace):
+    pass
+
+
+class Operation(BaseOperation):
+    """Удалить всю телеметрию, сохраненную на сервере."""
+
+    def setup_parser(self, parser: argparse.ArgumentParser) -> None:
+        pass
+
+    def run(self, a, b, telemetry_client: TelemetryClient) -> None:
+        try:
+            telemetry_client.send_telemetry("/delete")
+            print("✅ Вся телеметрия, сохраненная на сервере, была успешно удалена!")
+        except TelemetryError as ex:
+            print_err("❗ Ошибка:", ex)
+            return 1

hh_applicant_tool/operations/get_employer_contacts.py

@@ -4,7 +4,6 @@ from os import getenv
 
 from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
-from ..main import get_proxies
 from ..telemetry_client import TelemetryClient
 
 logger = logging.getLogger(__package__)
@@ -48,27 +47,27 @@ class Operation(BaseOperation):
             help="Номер страницы в выдаче",
         )
 
-    def run(self, args: Namespace) -> None:
-        proxies = get_proxies(args)
-        client = TelemetryClient(proxies=proxies)
-        auth = (
-            (args.username, args.password)
-            if args.username and args.password
-            else None
-        )
-        # Аутентификация пользователя
-        results = client.get_telemetry(
+    def run(self, args: Namespace, _, telemetry_client: TelemetryClient) -> None:
+        results = telemetry_client.get_telemetry(
             "/contact/persons",
             {"search": args.search, "per_page": 10, "page": args.page},
-            auth=auth,
         )
+        if "contact_persons" not in results:
+            print("❌", results)
+            return 1
+
+        print(
+            "Тут отображаются только данные, собранные с вашего telemetry_client_id. Вы так же можете их удалить с помощью команды delete-telemetry."
+        )
+        print()
+
         self._print_contacts(results)
 
     def _print_contacts(self, data: dict) -> None:
         """Вывод всех контактов в древовидной структуре."""
         page = data["page"]
         pages = (data["total"] // data["per_page"]) + 1
-        print(f"📋 Контакты ({page}/{pages}):")
+        print(f"Страница {page}/{pages}:")
         contacts = data.get("contact_persons", [])
         for idx, contact in enumerate(contacts):
             is_last_contact = idx == len(contacts) - 1
@@ -78,26 +77,11 @@ class Operation(BaseOperation):
     def _print_contact(self, contact: dict, is_last_contact: bool) -> None:
         """Вывод информации о конкретном контакте."""
         prefix = "└──" if is_last_contact else "├──"
-        print(f" {prefix} 🧑 {contact.get('name', 'н/д')}")
+        print(f" {prefix} 🧑 {contact.get('name', 'Имя скрыто')}")
         prefix2 = "    " if is_last_contact else " │   "
         print(f"{prefix2}├── 📧 Email: {contact.get('email', 'н/д')}")
         employer = contact.get("employer") or {}
         print(f"{prefix2}├── 🏢 Работодатель: {employer.get('name', 'н/д')}")
         print(f"{prefix2}├── 🏠 Город: {employer.get('area', 'н/д')}")
-        print(f"{prefix2}├── 🌐 Сайт: {employer.get('site_url', 'н/д')}")
-
-        phones = contact["phone_numbers"] or [{"phone_number": "(нет номеров)"}]
-        print(f"{prefix2}├── 📞 Телефоны:")
-        last_phone = len(phones) - 1
-        for i, phone in enumerate(phones):
-            sub_prefix = "└──" if i == last_phone else "├──"
-            print(f"{prefix2}│   {sub_prefix} {phone['phone_number']}")
-
-        telegrams = contact["telegram_usernames"] or [
-            {"username": "(нет аккаунтов)"}
-        ]
-        print(f"{prefix2}└── 📱 Telegram:")
-        last_telegram = len(telegrams) - 1
-        for i, telegram in enumerate(telegrams):
-            sub_prefix = "└──" if i == last_telegram else "├──"
-            print(f"{prefix2}    {sub_prefix} {telegram['username']}")
+        print(f"{prefix2}└── 🌐 Сайт: {employer.get('site_url', 'н/д')}")
+        print(prefix2)

hh_applicant_tool/operations/list_resumes.py

@@ -5,7 +5,7 @@ import logging
 from prettytable import PrettyTable
 
 from ..api import ApiClient
-from ..main import BaseOperation, get_api
+from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
 from ..types import ApiListResponse
 from ..utils import truncate_string
@@ -23,12 +23,9 @@ class Operation(BaseOperation):
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         pass
 
-    def run(self, args: Namespace) -> None:
-        api = get_api(args)
-        resumes: ApiListResponse = api.get("/resumes/mine")
-        t = PrettyTable(
-            field_names=["ID", "Название", "Статус"], align="l", valign="t"
-        )
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
+        resumes: ApiListResponse = api_client.get("/resumes/mine")
+        t = PrettyTable(field_names=["ID", "Название", "Статус"], align="l", valign="t")
         t.add_rows(
             [
                 (

hh_applicant_tool/operations/refresh_token.py

@@ -1,8 +1,8 @@
 # Этот модуль можно использовать как образец для других
 import argparse
 import logging
-
-from ..api import ApiError, OAuthClient
+from typing import Any
+from ..api import ApiError, ApiClient
 from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
 from ..utils import print_err
@@ -20,22 +20,9 @@ class Operation(BaseOperation):
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         pass
 
-    def run(self, args: Namespace) -> None:
-        if (
-            not args.config["token"]
-            or not args.config["token"]["refresh_token"]
-        ):
-            print_err("❗ Необходим refresh_token!")
-            return 1
+    def run(self, _, api_client: ApiClient, *args: Any) -> None:
         try:
-            oauth = OAuthClient(
-                user_agent=(
-                    args.config["oauth_user_agent"]
-                    or args.config["user_agent"]
-                ),
-            )
-            token = oauth.refresh_access(args.config["token"]["refresh_token"])
-            args.config.save(token=token)
+            api_client.refresh_access_token()
             print("✅ Токен обновлен!")
         except ApiError as ex:
             print_err("❗ Ошибка:", ex)

hh_applicant_tool/operations/reply_employers.py

@@ -4,10 +4,9 @@ import random
 import time
 from typing import Tuple
 
-from ..api import ApiError
+from ..api import ApiError, ApiClient
 from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
-from ..main import get_api
 from ..mixins import GetResumeIdMixin
 from ..utils import parse_interval, random_text
 
@@ -67,8 +66,8 @@ class Operation(BaseOperation, GetResumeIdMixin):
             action=argparse.BooleanOptionalAction,
         )
 
-    def run(self, args: Namespace) -> None:
-        self.api = get_api(args)
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
+        self.api_client = api_client
         self.resume_id = self._get_resume_id()
         self.reply_min_interval, self.reply_max_interval = args.reply_interval
         self.reply_message = args.reply_message or args.config["reply_message"]
@@ -80,7 +79,7 @@ class Operation(BaseOperation, GetResumeIdMixin):
         self._reply_chats()
 
     def _reply_chats(self) -> None:
-        me = self.me = self.api.get("/me")
+        me = self.me = self.api_client.get("/me")
 
         basic_message_placeholders = {
             "first_name": me.get("first_name", ""),
@@ -124,7 +123,7 @@ class Operation(BaseOperation, GetResumeIdMixin):
                 last_message: dict | None = None
                 message_history: list[str] = []
                 while True:
-                    messages_res = self.api.get(
+                    messages_res = self.api_client.get(
                         f"/negotiations/{nid}/messages", page=page
                     )
 
@@ -160,10 +159,12 @@ class Operation(BaseOperation, GetResumeIdMixin):
                         print("💼", message_placeholders["vacancy_name"])
                         print("📅", vacancy["created_at"])
                         if salary:
-                            salary_from = salary.get("from")or "-"
-                            salary_to = salary.get("to")or "-"
+                            salary_from = salary.get("from") or "-"
+                            salary_to = salary.get("to") or "-"
                             salary_currency = salary.get("currency")
-                            print("💵 от", salary_from, "до", salary_to, salary_currency)
+                            print(
+                                "💵 от", salary_from, "до", salary_to, salary_currency
+                            )
                         print("")
                         print("Последние сообщения:")
                         for msg in (
@@ -192,7 +193,7 @@ class Operation(BaseOperation, GetResumeIdMixin):
                             self.reply_max_interval,
                         )
                     )
-                    self.api.post(
+                    self.api_client.post(
                         f"/negotiations/{nid}/messages",
                         message=message,
                     )
@@ -208,7 +209,7 @@ class Operation(BaseOperation, GetResumeIdMixin):
     def _get_negotiations(self) -> list[dict]:
         rv = []
         for page in range(self.max_pages):
-            res = self.api.get("/negotiations", page=page, status="active")
+            res = self.api_client.get("/negotiations", page=page, status="active")
             rv.extend(res["items"])
             if page >= res["pages"] - 1:
                 break

hh_applicant_tool/operations/update_resumes.py

@@ -3,7 +3,7 @@ import argparse
 import logging
 
 from ..api import ApiClient, ApiError
-from ..main import BaseOperation, get_api
+from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
 from ..types import ApiListResponse
 from ..utils import print_err, truncate_string
@@ -21,12 +21,11 @@ class Operation(BaseOperation):
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         pass
 
-    def run(self, args: Namespace) -> None:
-        api = get_api(args)
-        resumes: ApiListResponse = api.get("/resumes/mine")
+    def run(self, args: Namespace, api_client: ApiClient, *_) -> None:
+        resumes: ApiListResponse = api_client.get("/resumes/mine")
         for resume in resumes["items"]:
             try:
-                res = api.post(f"/resumes/{resume['id']}/publish")
+                res = api_client.post(f"/resumes/{resume['id']}/publish")
                 assert res == {}
                 print("✅ Обновлено", truncate_string(resume["title"]))
             except ApiError as ex:

hh_applicant_tool/operations/whoami.py

@@ -4,7 +4,7 @@ import json
 import logging
 
 from ..api import ApiClient
-from ..main import BaseOperation, get_api
+from ..main import BaseOperation
 from ..main import Namespace as BaseNamespace
 
 logger = logging.getLogger(__package__)
@@ -20,7 +20,6 @@ class Operation(BaseOperation):
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         pass
 
-    def run(self, args: Namespace) -> None:
-        api = get_api(args)
-        result = api.get("/me")
-        print(json.dumps(result, ensure_ascii=True, indent=2, sort_keys=True))
+    def run(self, args: Namespace, api_client: ApiClient, _) -> None:
+        result = api_client.get("/me")
+        print(json.dumps(result, ensure_ascii=False, indent=2, sort_keys=True))

hh_applicant_tool/telemetry_client.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import logging
 import os
@@ -6,9 +8,10 @@ import warnings
 from functools import partialmethod
 from typing import Any, Dict, Optional
 from urllib.parse import urljoin
-
 import requests
+from .utils import Config
 
+# Сертификат на сервере давно истек, но его обновлять мне лень...
 warnings.filterwarnings("ignore", message="Unverified HTTPS request")
 
 logger = logging.getLogger(__package__)
@@ -28,6 +31,7 @@ class TelemetryClient:
 
     def __init__(
         self,
+        telemetry_client_id: str,
         server_address: Optional[str] = None,
         *,
         session: Optional[requests.Session] = None,
@@ -35,6 +39,7 @@ class TelemetryClient:
         proxies: dict | None = None,
         delay: Optional[float] = None,
     ) -> None:
+        self.send_telemetry_id = telemetry_client_id
         self.server_address = os.getenv(
             "TELEMETRY_SERVER", server_address or self.server_address
         )
@@ -67,7 +72,10 @@ class TelemetryClient:
             response = self.session.request(
                 method,
                 url,
-                headers={"User-Agent": self.user_agent},
+                headers={
+                    "User-Agent": self.user_agent,
+                    "X-Telemetry-Client-ID": self.send_telemetry_id,
+                },
                 proxies=self.proxies,
                 params=data if not has_body else None,
                 json=data if has_body else None,
@@ -91,3 +99,8 @@ class TelemetryClient:
 
     get_telemetry = partialmethod(request, "GET")
     send_telemetry = partialmethod(request, "POST")
+
+    @classmethod
+    def create_from_config(cls, config: Config) -> "TelemetryClient":
+        assert "telemetry_client_id" in config
+        return cls(config["telemetry_client_id"])