hh-applicant-tool 1.4.7__py3-none-any.whl → 1.4.12__py3-none-any.whl

hh_applicant_tool/__main__.py

@@ -1,6 +1,6 @@
 import sys
 
-from .hh_applicant import main
+from . import main
 
 if __name__ == "__main__":
     sys.exit(main())

hh_applicant_tool/ai/openai.py

@@ -24,7 +24,7 @@ class ChatOpenAI:
     max_completion_tokens: int = 1000
     session: requests.Session = field(default_factory=requests.Session)
 
-    def default_headers(self) -> dict[str, str]:
+    def _default_headers(self) -> dict[str, str]:
         return {
             "Authorization": f"Bearer {self.token}",
         }
@@ -44,7 +44,7 @@ class ChatOpenAI:
             response = self.session.post(
                 self.chat_endpoint,
                 json=payload,
-                headers=self.default_headers(),
+                headers=self._default_headers(),
                 timeout=30,
             )
             response.raise_for_status()

hh_applicant_tool/api/__init__.py

@@ -1,3 +1,5 @@
 """See <https://github.com/hhru/api>"""
-from .client import *
-from .errors import *
+
+from .client import *  # noqa: F403
+from .datatypes import *  # noqa: F403
+from .errors import *  # noqa: F403

hh_applicant_tool/api/client.py

@@ -13,11 +13,18 @@ from urllib.parse import urlencode, urljoin
 import requests
 from requests import Session
 
-from ..datatypes import AccessToken
 from . import errors
+from .client_keys import (
+    ANDROID_CLIENT_ID,
+    ANDROID_CLIENT_SECRET,
+)
+from .datatypes import AccessToken
+from .user_agent import generate_android_useragent
 
 __all__ = ("ApiClient", "OAuthClient")
 
+HH_API_URL = "https://api.hh.ru/"
+HH_OAUTH_URL = "https://hh.ru/oauth/"
 DEFAULT_DELAY = 0.334
 
 AllowedMethods = Literal["GET", "POST", "PUT", "DELETE"]
@@ -38,7 +45,7 @@ class BaseClient:
     _previous_request_time: float = 0.0
 
     def __post_init__(self) -> None:
-        assert self.base_url.endswith("/"), "base_url must end with /"
+        assert self.base_url.endswith("/"), "base_url must ends with /"
         self.lock = Lock()
         # logger.debug(f"user agent: {self.user_agent}")
         if not self.session:
@@ -51,10 +58,9 @@ class BaseClient:
     def proxies(self):
         return self.session.proxies
 
-    def default_headers(self) -> dict[str, str]:
+    def _default_headers(self) -> dict[str, str]:
         return {
-            "user-agent": self.user_agent
-            or "Mozilla/5.0 (+https://github.com/s3rgeym/hh-applicant-tool)",
+            "user-agent": self.user_agent or generate_android_useragent(),
             "x-hh-app-active": "true",
         }
 
@@ -87,7 +93,7 @@ class BaseClient:
                 method,
                 url,
                 **payload,
-                headers=self.default_headers(),
+                headers=self._default_headers(),
                 allow_redirects=False,
             )
             try:
@@ -139,14 +145,19 @@ class BaseClient:
 
 @dataclass
 class OAuthClient(BaseClient):
-    client_id: str
-    client_secret: str
+    client_id: str | None = None
+    client_secret: str | None = None
     _: dataclasses.KW_ONLY
-    base_url: str = "https://hh.ru/oauth/"
+    base_url: str = HH_OAUTH_URL
     state: str = ""
     scope: str = ""
     redirect_uri: str = ""
 
+    def __post_init__(self) -> None:
+        super().__post_init__()
+        self.client_id = self.client_id or ANDROID_CLIENT_ID
+        self.client_secret = self.client_secret or ANDROID_CLIENT_SECRET
+
     @property
     def authorize_url(self) -> str:
         params = dict(
@@ -197,7 +208,7 @@ class ApiClient(BaseClient):
     _: dataclasses.KW_ONLY
     client_id: str | None = None
     client_secret: str | None = None
-    base_url: str = "https://api.hh.ru/"
+    base_url: str = HH_API_URL
 
     @property
     def is_access_expired(self) -> bool:
@@ -212,10 +223,10 @@ class ApiClient(BaseClient):
             session=self.session,
         )
 
-    def default_headers(
+    def _default_headers(
         self,
     ) -> dict[str, str]:
-        headers = super().default_headers()
+        headers = super()._default_headers()
         if not self.access_token:
             return headers
         # Это очень интересно, что access token'ы начинаются с USER, т.е. API может содержать какую-то уязвимость, связанную с этим

hh_applicant_tool/{constants.py → api/client_keys.py}

@@ -1,6 +1,6 @@
-# USER_AGENT_TEMPLATE = "Mozilla/5.0 (Linux; Android %s; %s) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s.0.0.0 Mobile Safari/537.36"
-
-ANDROID_CLIENT_ID = "HIOMIAS39CA9DICTA7JIO64LQKQJF5AGIK74G9ITJKLNEDAOH5FHS5G1JI7FOEGD"
+ANDROID_CLIENT_ID = (
+    "HIOMIAS39CA9DICTA7JIO64LQKQJF5AGIK74G9ITJKLNEDAOH5FHS5G1JI7FOEGD"
+)
 
 ANDROID_CLIENT_SECRET = (
     "V9M870DE342BGHFRUJ5FTCGCUA1482AN0DI8C5TFI9ULMA89H10N60NOP8I4JMVS"

hh_applicant_tool/{datatypes.py → api/datatypes.py}

@@ -32,6 +32,8 @@ class PaginatedItems(TypedDict, Generic[Item]):
     arguments: Optional[Any]
     fixes: Optional[Any]
     suggests: Optional[Any]
+    # Это выглядит как глюк. Я нейронке скармливал выхлоп апи, а она писала эти
+    # типы
     alternate_url: str
 
 

hh_applicant_tool/api/errors.py

@@ -46,7 +46,11 @@ class ApiError(BadResponse):
 
     @property
     def message(self) -> str:
-        return self._data.get("description") or str(self._data)
+        return (
+            self._data.get("error_description")
+            or self._data.get("description")
+            or str(self._data)
+        )
 
     #     def __getattr__(self, name: str) -> Any:
     #         try:
@@ -62,7 +66,9 @@ class ApiError(BadResponse):
         return any(v.get("value") == value for v in data.get("errors", []))
 
     @classmethod
-    def raise_for_status(cls: Type[ApiError], response: Response, data: dict) -> None:
+    def raise_for_status(
+        cls: Type[ApiError], response: Response, data: dict
+    ) -> None:
         match response.status_code:
             case status if 300 <= status <= 308:
                 raise Redirect(response, data)

hh_applicant_tool/{utils → api}/user_agent.py

@@ -2,7 +2,7 @@ import random
 import uuid
 
 
-def hh_android_useragent() -> str:
+def generate_android_useragent() -> str:
     """Generates Android App User-Agent"""
     devices = (
         "23053RN02A, 23053RN02Y, 23053RN02I, 23053RN02L, 23077RABDC".split(", ")

hh_applicant_tool/main.py

@@ -17,9 +17,8 @@ from typing import Any, Iterable
 import requests
 import urllib3
 
-from . import datatypes, utils
-from .api import ApiClient
-from .constants import ANDROID_CLIENT_ID, ANDROID_CLIENT_SECRET
+from . import utils
+from .api import ApiClient, datatypes
 from .storage import StorageFacade
 from .utils.log import setup_logger
 from .utils.mixins import MegaTool
@@ -205,13 +204,13 @@ class HHApplicantTool(MegaTool):
         config = self.config
         token = config.get("token", {})
         api = ApiClient(
-            client_id=config.get("client_id", ANDROID_CLIENT_ID),
-            client_secret=config.get("client_id", ANDROID_CLIENT_SECRET),
+            client_id=config.get("client_id"),
+            client_secret=config.get("client_id"),
             access_token=token.get("access_token"),
             refresh_token=token.get("refresh_token"),
             access_expires_at=token.get("access_expires_at"),
             delay=args.delay,
-            user_agent=config["user_agent"] or utils.hh_android_useragent(),
+            user_agent=config.get("user_agent"),
             session=self.session,
         )
         return api
@@ -219,13 +218,12 @@ class HHApplicantTool(MegaTool):
     def get_me(self) -> datatypes.User:
         return self.api_client.get("/me")
 
-    def get_resumes(self) -> datatypes.PaginatedItems[datatypes.Resume]:
-        return self.api_client.get("/resumes/mine")
+    def get_resumes(self) -> list[datatypes.Resume]:
+        return self.api_client.get("/resumes/mine")["items"]
 
-    def first_resume_id(self):
-        resumes = self.api_client.get("/resumes/mine")
-        assert len(resumes["items"]), "Empty resume list"
-        return resumes["items"][0]["id"]
+    def first_resume_id(self) -> str:
+        resumes = self.get_resumes()
+        return resumes[0]["id"]
 
     def get_blacklisted(self) -> list[str]:
         rv = []
@@ -305,9 +303,10 @@ class HHApplicantTool(MegaTool):
             return 2
         finally:
             try:
-                self.check_system()
+                self._check_system()
             except Exception:
                 pass
+                # raise
 
     def _parse_args(self, argv) -> None:
         self._parser = self._create_parser()

hh_applicant_tool/operations/apply_similar.py

@@ -4,14 +4,14 @@ import argparse
 import logging
 import random
 from pathlib import Path
-from typing import TYPE_CHECKING, Iterator, TextIO
+from typing import TYPE_CHECKING, Iterator
 
-from .. import datatypes
 from ..ai.base import AIError
-from ..api import BadResponse, Redirect
+from ..api import BadResponse, Redirect, datatypes
+from ..api.datatypes import PaginatedItems, SearchVacancy
 from ..api.errors import ApiError, LimitExceeded
-from ..datatypes import PaginatedItems, SearchVacancy
 from ..main import BaseNamespace, BaseOperation
+from ..storage.repositories.errors import RepositoryError
 from ..utils import bool2str, list2str, rand_text, shorten
 
 if TYPE_CHECKING:
@@ -23,7 +23,7 @@ logger = logging.getLogger(__package__)
 
 class Namespace(BaseNamespace):
     resume_id: str | None
-    message_list: TextIO
+    message_list_path: Path
     ignore_employers: Path | None
     force_message: bool
     use_ai: bool
@@ -62,10 +62,9 @@ class Namespace(BaseNamespace):
 
 
 class Operation(BaseOperation):
-    """Откликнуться на все подходящие вакансии.
+    """Откликнуться на все подходящие вакансии."""
 
-    Описание фильтров для поиска вакансий: <https://api.hh.ru/openapi/redoc#tag/Poisk-vakansij-dlya-soiskatelya/operation/get-vacancies-similar-to-resume>
-    """
+    __aliases__ = ("apply",)
 
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
         parser.add_argument("--resume-id", help="Идентефикатор резюме")
@@ -76,9 +75,10 @@ class Operation(BaseOperation):
         )
         parser.add_argument(
             "-L",
+            "--message-list-path",
             "--message-list",
             help="Путь до файла, где хранятся сообщения для отклика на вакансии. Каждое сообщение — с новой строки.",  # noqa: E501
-            type=argparse.FileType("r", encoding="utf-8", errors="replace"),
+            type=Path,
         )
         parser.add_argument(
             "-f",
@@ -243,7 +243,7 @@ class Operation(BaseOperation):
         self.api_client = tool.api_client
         args: Namespace = tool.args
         self.application_messages = self._get_application_messages(
-            args.message_list
+            args.message_list_path
         )
         self.area = args.area
         self.bottom_lat = args.bottom_lat
@@ -268,7 +268,7 @@ class Operation(BaseOperation):
         self.pre_prompt = args.prompt
         self.premium = args.premium
         self.professional_role = args.professional_role
-        self.resume_id = args.resume_id or tool.first_resume_id()
+        self.resume_id = args.resume_id
         self.right_lng = args.right_lng
         self.salary = args.salary
         self.schedule = args.schedule
@@ -283,52 +283,96 @@ class Operation(BaseOperation):
         )
         self._apply_similar()
 
-    def _get_application_messages(
-        self, message_list: TextIO | None
-    ) -> list[str]:
-        return (
-            list(filter(None, map(str.strip, message_list)))
-            if message_list
-            else [
-                "{Меня заинтересовала|Мне понравилась} ваша вакансия %(vacancy_name)s",
-                "{Прошу рассмотреть|Предлагаю рассмотреть} {мою кандидатуру|мое резюме} на вакансию %(vacancy_name)s",  # noqa: E501
-            ]
-        )
-
     def _apply_similar(self) -> None:
+        resumes: list[datatypes.Resume] = self.tool.get_resumes()
+        try:
+            self.tool.storage.resumes.save_batch(resumes)
+        except RepositoryError as ex:
+            logger.exception(ex)
+        resumes = (
+            list(filter(lambda x: x["id"] == self.resume_id, resumes))
+            if self.resume_id
+            else resumes
+        )
+        # Выбираем только опубликованные
+        resumes = list(
+            filter(lambda x: x["status"]["id"] == "published", resumes)
+        )
+        if not resumes:
+            logger.warning("У вас нет опубликованных резюме")
+            return
+
         me: datatypes.User = self.tool.get_me()
+        seen_employers = set()
 
-        basic_placeholders = {
-            "first_name": me.get("first_name", ""),
-            "last_name": me.get("last_name", ""),
-            "email": me.get("email", ""),
-            "phone": me.get("phone", ""),
+        for resume in resumes:
+            self._apply_resume(
+                resume=resume,
+                user=me,
+                seen_employers=seen_employers,
+            )
+
+        # Синхронизация откликов
+        # for neg in self.tool.get_negotiations():
+        #     try:
+        #         self.tool.storage.negotiations.save(neg)
+        #     except RepositoryError as e:
+        #         logger.warning(e)
+
+        print("📝 Отклики на вакансии разосланы!")
+
+    def _apply_resume(
+        self,
+        resume: datatypes.Resume,
+        user: datatypes.User,
+        seen_employers: set[str],
+    ) -> None:
+        logger.info("Начинаю рассылку откликов для резюме: %s", resume["title"])
+
+        placeholders = {
+            "first_name": user.get("first_name") or "",
+            "last_name": user.get("last_name") or "",
+            "email": user.get("email") or "",
+            "phone": user.get("phone") or "",
+            "resume_title": resume.get("title") or "",
         }
 
-        seen_employers = set()
-        for vacancy in self._get_vacancies():
+        for vacancy in self._get_similar_vacancies(resume_id=resume["id"]):
             try:
                 employer = vacancy.get("employer", {})
 
-                placeholders = {
+                message_placeholders = {
                     "vacancy_name": vacancy.get("name", ""),
                     "employer_name": employer.get("name", ""),
-                    **basic_placeholders,
+                    **placeholders,
                 }
 
                 storage = self.tool.storage
-                storage.vacancies.save(vacancy)
+
+                try:
+                    storage.vacancies.save(vacancy)
+                except RepositoryError as ex:
+                    logger.debug(ex)
+
                 if employer := vacancy.get("employer"):
                     employer_id = employer.get("id")
                     if employer_id and employer_id not in seen_employers:
                         employer_profile: datatypes.Employer = (
                             self.api_client.get(f"/employers/{employer_id}")
                         )
-                        storage.employers.save(employer_profile)
+
+                        try:
+                            storage.employers.save(employer_profile)
+                        except RepositoryError as ex:
+                            logger.exception(ex)
 
                 # По факту контакты можно получить только здесь?!
                 if vacancy.get("contacts"):
-                    storage.employer_contacts.save(vacancy)
+                    try:
+                        # logger.debug(vacancy)
+                        storage.vacancy_contacts.save(vacancy)
+                    except RecursionError as ex:
+                        logger.exception(ex)
 
                 if vacancy.get("has_test"):
                     logger.debug(
@@ -363,13 +407,20 @@ class Operation(BaseOperation):
                     )
                     if "got_rejection" in relations:
                         logger.debug(
-                            "Вы получили отказ: %s", vacancy["alternate_url"]
+                            "Вы получили отказ от %s на резюме %s",
+                            vacancy["alternate_url"],
+                            resume["alternate_url"],
+                        )
+                        print(
+                            "⛔  Пришел отказ от",
+                            vacancy["alternate_url"],
+                            "на резюме",
+                            resume["alternate_url"],
                         )
-                        print("⛔  Пришел отказ", vacancy["alternate_url"])
                     continue
 
                 params = {
-                    "resume_id": self.resume_id,
+                    "resume_id": resume["id"],
                     "vacancy_id": vacancy_id,
                     "message": "",
                 }
@@ -379,13 +430,19 @@ class Operation(BaseOperation):
                 ):
                     if self.openai_chat:
                         msg = self.pre_prompt + "\n\n"
-                        msg += placeholders["vacancy_name"]
+                        msg += (
+                            "Название вакансии: "
+                            + message_placeholders["vacancy_name"]
+                        )
+                        msg += (
+                            "Мое резюме:" + message_placeholders["resume_title"]
+                        )
                         logger.debug("prompt: %s", msg)
                         msg = self.openai_chat.send_message(msg)
                     else:
                         msg = (
                             rand_text(random.choice(self.application_messages))
-                            % placeholders
+                            % message_placeholders
                         )
 
                     logger.debug(msg)
@@ -400,12 +457,18 @@ class Operation(BaseOperation):
                         )
                         assert res == {}
                         logger.debug(
-                            "Отправили отклик: %s", vacancy["alternate_url"]
+                            "Откликнулись на %s с резюме %s",
+                            vacancy["alternate_url"],
+                            resume["alternate_url"],
                         )
                     print(
-                        "📨 Отправили отклик:",
+                        "📨 Отправили отклик для резюме",
+                        resume["alternate_url"],
+                        "на вакансию",
                         vacancy["alternate_url"],
+                        "(",
                         shorten(vacancy["name"]),
+                        ")",
                     )
                 except Redirect:
                     logger.warning(
@@ -414,15 +477,12 @@ class Operation(BaseOperation):
             except LimitExceeded:
                 logger.info("Достигли лимита на отклики")
                 print("⚠️ Достигли лимита рассылки")
-                # self.tool.storage.settings.set_value("_")
                 break
             except ApiError as ex:
                 logger.warning(ex)
             except (BadResponse, AIError) as ex:
                 logger.error(ex)
 
-        print("📝 Отклики на вакансии разосланы!")
-
     def _get_search_params(self, page: int) -> dict:
         params = {
             "page": page,
@@ -489,11 +549,11 @@ class Operation(BaseOperation):
 
         return params
 
-    def _get_vacancies(self) -> Iterator[SearchVacancy]:
+    def _get_similar_vacancies(self, resume_id: str) -> Iterator[SearchVacancy]:
         for page in range(self.total_pages):
             params = self._get_search_params(page)
             res: PaginatedItems[SearchVacancy] = self.api_client.get(
-                f"/resumes/{self.resume_id}/similar_vacancies",
+                f"/resumes/{resume_id}/similar_vacancies",
                 params,
             )
             if not res["items"]:
@@ -503,3 +563,21 @@ class Operation(BaseOperation):
 
             if page >= res["pages"] - 1:
                 return
+
+    def _get_application_messages(self, path: Path | None) -> list[str]:
+        return (
+            list(
+                filter(
+                    None,
+                    map(
+                        str.strip,
+                        path.open(encoding="utf-8", errors="replace"),
+                    ),
+                )
+            )
+            if path
+            else [
+                "Здравствуйте, меня зовут %(first_name)s. {Меня заинтересовала|Мне понравилась} ваша вакансия «%(vacancy_name)s». Хотелось бы {пообщаться|задать вопросы} о ней.",
+                "{Прошу|Предлагаю} рассмотреть {мою кандидатуру|мое резюме «%(resume_title)s»} на вакансию «%(vacancy_name)s». С уважением, %(first_name)s.",  # noqa: E501
+            ]
+        )