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

hh_applicant_tool/operations/list_resumes.py

@@ -6,12 +6,12 @@ from typing import TYPE_CHECKING
 
 from prettytable import PrettyTable
 
-from ..datatypes import PaginatedItems
+from ..api.datatypes import PaginatedItems
 from ..main import BaseNamespace, BaseOperation
 from ..utils.string import shorten
 
 if TYPE_CHECKING:
-    from .. import datatypes
+    from ..api import datatypes
     from ..main import HHApplicantTool
 
 
@@ -32,9 +32,8 @@ class Operation(BaseOperation):
 
     def run(self, tool: HHApplicantTool) -> None:
         resumes: PaginatedItems[datatypes.Resume] = tool.get_resumes()
-        storage = tool.storage
-        for resume in resumes["items"]:
-            storage.resumes.save(resume)
+        logger.debug(resumes)
+        tool.storage.resumes.save_batch(resumes)
 
         t = PrettyTable(
             field_names=["ID", "Название", "Статус"], align="l", valign="t"
@@ -46,8 +45,7 @@ class Operation(BaseOperation):
                     shorten(x["title"]),
                     x["status"]["name"].title(),
                 )
-                for x in resumes["items"]
+                for x in resumes
             ]
         )
         print(t)
-        print(f"\nНайдено резюме: {resumes['found']}")

hh_applicant_tool/operations/query.py

@@ -68,7 +68,7 @@ class Operation(BaseOperation):
                         writer.writerows(cursor.fetchall())
 
                         if tool.args.output:
-                            print(f"✅ Exported to {tool.args.output.name}")
+                            print(f"✅  Exported to {tool.args.output.name}")
                         return
 
                     rows = cursor.fetchmany(MAX_RESULTS + 1)
@@ -88,10 +88,12 @@ class Operation(BaseOperation):
                         )
                 else:
                     tool.db.commit()
-                    print(f"OK. Rows affected: {cursor.rowcount}")
+
+                    if cursor.rowcount > 0:
+                        print(f"Rows affected: {cursor.rowcount}")
 
             except sqlite3.Error as ex:
-                print(f"❌ SQL Error: {ex}")
+                print(f"❌  SQL Error: {ex}")
                 return 1
 
         if initial_sql := tool.args.sql:

hh_applicant_tool/operations/refresh_token.py

@@ -26,5 +26,12 @@ class Operation(BaseOperation):
         pass
 
     def run(self, tool: HHApplicantTool) -> None:
-        tool.api_client.refresh_access_token()
-        print("✅ Токен обновлен!")
+        if tool.api_client.is_access_expired:
+            tool.api_client.refresh_access_token()
+            if not tool.save_token():
+                print("⚠️ Токен не был обновлен!")
+                return 1
+            print("✅ Токен успешно обновлен.")
+        else:
+            # logger.debug("Токен валиден, игнорируем обновление.")
+            print("ℹ️ Токен не истек, обновление не требуется.")

hh_applicant_tool/operations/reply_employers.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import argparse
 import logging
 import random
+from datetime import datetime
 from typing import TYPE_CHECKING
 
-from .. import datatypes
 from ..ai.base import AIError
-from ..api import ApiError
+from ..api import ApiError, datatypes
 from ..main import BaseNamespace, BaseOperation
-from ..utils.dateutil import parse_api_datetime
+from ..utils.date import parse_api_datetime
 from ..utils.string import rand_text
 
 if TYPE_CHECKING:
@@ -37,21 +37,30 @@ class Namespace(BaseNamespace):
     use_ai: bool
     first_prompt: str
     prompt: str
+    period: int
 
 
 class Operation(BaseOperation):
     """Ответ всем работодателям."""
 
-    __aliases__ = ["reply-chats", "reply-all"]
+    __aliases__ = ["reply-empls", "reply-chats", "reall"]
 
     def setup_parser(self, parser: argparse.ArgumentParser) -> None:
-        parser.add_argument("--resume-id", help="Идентификатор резюме")
+        parser.add_argument(
+            "--resume-id",
+            help="Идентификатор резюме. Если не указан, то просматриваем чаты для всех резюме",
+        )
         parser.add_argument(
             "-m",
             "--reply-message",
             "--reply",
             help="Отправить сообщение во все чаты. Если не передать сообщение, то нужно будет вводить его в интерактивном режиме.",  # noqa: E501
         )
+        parser.add_argument(
+            "--period",
+            type=int,
+            help="Игнорировать отклики, которые не обновлялись больше N дней",
+        )
         parser.add_argument(
             "-p",
             "--max-pages",
@@ -92,7 +101,7 @@ class Operation(BaseOperation):
 
     def run(self, tool: HHApplicantTool) -> None:
         args: Namespace = tool.args
-        self.applicant_tool = tool
+        self.tool = tool
         self.api_client = tool.api_client
         self.resume_id = tool.first_resume_id()
         self.reply_message = args.reply_message or tool.config.get(
@@ -106,27 +115,60 @@ class Operation(BaseOperation):
         self.openai_chat = (
             tool.get_openai_chat(args.first_prompt) if args.use_ai else None
         )
+        self.period = args.period
 
         logger.debug(f"{self.reply_message = }")
-        self.reply_chats()
-
-    def reply_chats(self) -> None:
-        blacklisted = self.applicant_tool.get_blacklisted()
-        logger.debug(f"{blacklisted = }")
-        me: datatypes.User = self.applicant_tool.get_me()
-
-        basic_message_placeholders = {
-            "first_name": me.get("first_name", ""),
-            "last_name": me.get("last_name", ""),
-            "email": me.get("email", ""),
-            "phone": me.get("phone", ""),
+        self.reply_employers()
+
+    def reply_employers(self):
+        blacklist = set(self.tool.get_blacklisted())
+        me: datatypes.User = self.tool.get_me()
+        resumes = self.tool.get_resumes()
+        resumes = (
+            list(filter(lambda x: x["id"] == self.resume_id, resumes))
+            if self.resume_id
+            else resumes
+        )
+        resumes = list(
+            filter(
+                lambda resume: resume["status"]["id"] == "published", resumes
+            )
+        )
+        self._reply_chats(user=me, resumes=resumes, blacklist=blacklist)
+
+    def _reply_chats(
+        self,
+        user: datatypes.User,
+        resumes: list[datatypes.Resume],
+        blacklist: set[str],
+    ) -> None:
+        resume_map = {r["id"]: r for r in resumes}
+
+        base_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 "",
         }
 
-        for negotiation in self.applicant_tool.get_negotiations():
+        for negotiation in self.tool.get_negotiations():
             try:
-                self.applicant_tool.storage.negotiations.save(negotiation)
+                # try:
+                #     self.tool.storage.negotiations.save(negotiation)
+                # except RepositoryError as e:
+                #     logger.exception(e)
 
-                if self.resume_id != negotiation["resume"]["id"]:
+                if not (resume := resume_map.get(negotiation["resume"]["id"])):
+                    continue
+
+                updated_at = parse_api_datetime(negotiation["updated_at"])
+
+                # Пропуск откликов, которые не обновлялись более N дней (при просмотре они обновляются вроде)
+                if (
+                    self.period
+                    and (datetime().now(updated_at.tzinfo) - updated_at).days
+                    > self.period
+                ):
                     continue
 
                 state_id = negotiation["state"]["id"]
@@ -141,26 +183,27 @@ class Operation(BaseOperation):
                 employer = vacancy.get("employer") or {}
                 salary = vacancy.get("salary") or {}
 
-                if employer.get("id") in blacklisted:
+                if employer.get("id") in blacklist:
                     print(
                         "🚫 Пропускаем заблокированного работодателя",
                         employer.get("alternate_url"),
                     )
                     continue
 
-                message_placeholders = {
+                placeholders = {
                     "vacancy_name": vacancy.get("name", ""),
                     "employer_name": employer.get("name", ""),
-                    **basic_message_placeholders,
+                    "resume_title": resume.get("title") or "",
+                    **base_placeholders,
                 }
 
                 logger.debug(
                     "Вакансия %(vacancy_name)s от %(employer_name)s"
-                    % message_placeholders
+                    % placeholders
                 )
 
                 page: int = 0
-                last_message: dict | None = None
+                last_message: datatypes.Message | None = None
                 message_history: list[str] = []
                 while True:
                     messages_res: datatypes.PaginatedItems[
@@ -183,7 +226,8 @@ class Operation(BaseOperation):
                         )
                         message_date = parse_api_datetime(
                             message.get("created_at")
-                        ).isoformat()
+                        ).strftime("%d.%m.%Y %H:%M:%S")
+
                         message_history.append(
                             f"[ {message_date} ] {author}: {message['text']}"
                         )
@@ -205,13 +249,13 @@ class Operation(BaseOperation):
                     send_message = ""
                     if self.reply_message:
                         send_message = (
-                            rand_text(self.reply_message) % message_placeholders
+                            rand_text(self.reply_message) % placeholders
                         )
                         logger.debug(f"Template message: {send_message}")
                     elif self.openai_chat:
                         try:
                             ai_query = (
-                                f"Вакансия: {message_placeholders['vacancy_name']}\n"
+                                f"Вакансия: {placeholders['vacancy_name']}\n"
                                 f"История переписки:\n"
                                 + "\n".join(message_history[-10:])
                                 + f"\n\nИнструкция: {self.pre_prompt}"
@@ -226,12 +270,8 @@ class Operation(BaseOperation):
                             )
                             continue
                     else:
-                        print(
-                            "\n🏢",
-                            message_placeholders["employer_name"],
-                            "| 💼",
-                            message_placeholders["vacancy_name"],
-                        )
+                        print("🏢", placeholders["employer_name"])
+                        print("💼", placeholders["vacancy_name"])
                         if salary:
                             print(
                                 "💵 от",
@@ -251,9 +291,10 @@ class Operation(BaseOperation):
                             print(msg)
 
                         try:
-                            print("-" * 10)
+                            print("-" * 40)
+                            print("Активное резюме:", resume.get("title") or "")
                             print(
-                                "Команды: /ban, /cancel <опционально сообщение для отмены>"
+                                "/ban, /cancel необязательное сообщение для отмены"
                             )
                             send_message = input("Ваше сообщение: ").strip()
                         except EOFError:
@@ -264,13 +305,12 @@ class Operation(BaseOperation):
                             continue
 
                         if send_message.startswith("/ban"):
-                            self.applicant_tool.storage.employers.save(employer)
                             self.api_client.put(
                                 f"/employers/blacklisted/{employer['id']}"
                             )
-                            blacklisted.append(employer["id"])
+                            blacklist.add(employer["id"])
                             print(
-                                "🚫 Работодатель в ЧС",
+                                "🚫 Работодатель заблокирован",
                                 employer.get("alternate_url"),
                             )
                             continue

hh_applicant_tool/operations/settings.py

@@ -7,8 +7,8 @@ from typing import TYPE_CHECKING
 
 from prettytable import PrettyTable
 
+from .. import utils
 from ..main import BaseNamespace, BaseOperation
-from ..utils import jsonutil
 
 if TYPE_CHECKING:
     from ..main import HHApplicantTool
@@ -28,7 +28,7 @@ class Namespace(BaseNamespace):
 
 def parse_value(v):
     try:
-        return jsonutil.loads(v)
+        return utils.json.loads(v)
     except json.JSONDecodeError:
         return v
 

hh_applicant_tool/operations/update_resumes.py

@@ -5,8 +5,7 @@ import argparse
 import logging
 from typing import TYPE_CHECKING
 
-from ..api import ApiError
-from ..datatypes import PaginatedItems
+from ..api import ApiError, datatypes
 from ..main import BaseNamespace, BaseOperation
 from ..utils import print_err
 from ..utils.string import shorten
@@ -31,8 +30,10 @@ class Operation(BaseOperation):
         pass
 
     def run(self, tool: HHApplicantTool) -> None:
-        resumes: PaginatedItems = tool.get_resumes()
-        for resume in resumes["items"]:
+        resumes: list[datatypes.Resume] = tool.get_resumes()
+        # Там вызов API меняет поля
+        # tool.storage.resumes.save_batch(resumes)
+        for resume in resumes:
             try:
                 res = tool.api_client.post(
                     f"/resumes/{resume['id']}/publish",

hh_applicant_tool/operations/whoami.py

@@ -5,7 +5,7 @@ import argparse
 import logging
 from typing import TYPE_CHECKING
 
-from .. import datatypes
+from ..api import datatypes
 from ..main import BaseNamespace, BaseOperation
 
 if TYPE_CHECKING:
@@ -53,6 +53,6 @@ class Operation(BaseOperation):
         print(
             f"🆔 {result['id']} {full_name or 'Анонимный аккаунт'} "
             f"[ 📄 {counters['resumes_count']} "
-            f"| 👁️  {fmt_plus(counters['new_resume_views'])} "
-            f"| ✉️  {fmt_plus(counters['unread_negotiations'])} ]"
+            f"| 👁️ {fmt_plus(counters['new_resume_views'])} "
+            f"| ✉️ {fmt_plus(counters['unread_negotiations'])} ]"
         )

hh_applicant_tool/storage/__init__.py

@@ -1,4 +1,8 @@
 from .facade import StorageFacade
 from .utils import apply_migration, list_migrations
 
-__all__ = ["StorageFacade", "apply_migration", "list_migrations"]
+__all__ = [
+    "StorageFacade",
+    "apply_migration",
+    "list_migrations",
+]

hh_applicant_tool/storage/facade.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import sqlite3
 
-from .repositories.contacts import EmployerContactsRepository
+from .repositories.contacts import VacancyContactsRepository
 from .repositories.employers import EmployersRepository
 from .repositories.negotiations import NegotiationRepository
 from .repositories.resumes import ResumesRepository
@@ -18,7 +18,7 @@ class StorageFacade:
         init_db(conn)
         self.employers = EmployersRepository(conn)
         self.vacancies = VacanciesRepository(conn)
-        self.employer_contacts = EmployerContactsRepository(conn)
+        self.vacancy_contacts = VacancyContactsRepository(conn)
         self.negotiations = NegotiationRepository(conn)
         self.settings = SettingsRepository(conn)
         self.resumes = ResumesRepository(conn)

hh_applicant_tool/storage/models/base.py

@@ -4,8 +4,8 @@ from datetime import datetime
 from logging import getLogger
 from typing import Any, Callable, Mapping, Self, dataclass_transform, get_origin
 
-from hh_applicant_tool.utils import jsonutil
-from hh_applicant_tool.utils.dateutil import try_parse_datetime
+from hh_applicant_tool.utils import json
+from hh_applicant_tool.utils.date import try_parse_datetime
 
 logger = getLogger(__package__)
 
@@ -13,12 +13,15 @@ MISSING = object()
 
 
 def mapped(
+    *,
+    skip_src: bool = False,
     path: str | None = None,
     transform: Callable[[Any], Any] | None = None,
     store_json: bool = False,
     **kwargs: Any,
 ):
     metadata = kwargs.get("metadata", {})
+    metadata.setdefault("skip_src", skip_src)
     metadata.setdefault("path", path)
     metadata.setdefault("transform", transform)
     metadata.setdefault("store_json", store_json)
@@ -48,7 +51,7 @@ class BaseModel:
             if value is MISSING:
                 continue
             if f.metadata.get("store_json"):
-                value = jsonutil.dumps(value)
+                value = json.dumps(value)
             # Точно не нужно типы приводить перед сохранением
             # else:
             #     value = self._coerce_type(value, f)
@@ -89,6 +92,8 @@ class BaseModel:
         kwargs = {}
         for f in fields(cls):
             if from_source:
+                if f.metadata.get("skip_src") and f.name in data:
+                    continue
                 if path := f.metadata.get("path"):
                     found = True
                     v = data
@@ -118,7 +123,7 @@ class BaseModel:
                     continue
 
                 if f.metadata.get("store_json"):
-                    value = jsonutil.loads(value)
+                    value = json.loads(value)
                 else:
                     value = cls._coerce_type(value, f)
 

hh_applicant_tool/storage/models/contacts.py

@@ -0,0 +1,42 @@
+import secrets
+
+from .base import BaseModel, mapped
+
+
+# Из вакансии извлекается
+class VacancyContactsModel(BaseModel):
+    # При вызове from_api на вакансии нужно игнорировать ее id
+    id: str = mapped(
+        skip_src=True,
+        default_factory=lambda: secrets.token_hex(16),
+    )
+    vacancy_id: int = mapped(path="id")
+
+    vacancy_name: str = mapped(path="name")
+    vacancy_alternate_url: str = mapped(path="alternate_url", default=None)
+    vacancy_area_id: int = mapped(path="area.id", default=None)
+    vacancy_area_name: str = mapped(path="area.name", default=None)
+    vacancy_salary_from: int = mapped(path="salary.from", default=0)
+    vacancy_salary_to: int = mapped(path="salary.to", default=0)
+    vacancy_currency: str = mapped(path="salary.currency", default="RUR")
+    vacancy_gross: bool = mapped(path="salary.gross", default=False)
+
+    employer_id: int = mapped(path="employer.id", default=None)
+    employer_name: str = mapped(path="employer.name", default=None)
+    email: str = mapped(path="contacts.email")
+    name: str = mapped(path="contacts.name", default=None)
+    phone_numbers: str = mapped(
+        path="contacts.phones",
+        transform=lambda phones: ", ".join(
+            p["formatted"] for p in phones if p.get("number")
+        ),
+        default=None,
+    )
+
+    def __post_init__(self):
+        self.vacancy_salary_from = (
+            self.vacancy_salary_from or self.vacancy_salary_to or 0
+        )
+        self.vacancy_salary_to = (
+            self.vacancy_salary_to or self.vacancy_salary_from or 0
+        )

hh_applicant_tool/storage/queries/schema.sql

@@ -14,17 +14,29 @@ CREATE TABLE IF NOT EXISTS employers (
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
 );
-/* ===================== employer_contacts ===================== */
-CREATE TABLE IF NOT EXISTS employer_contacts (
-    id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))),
-    employer_id INTEGER NOT NULL,
-    -- Просто поле, без REFERENCES
+/* ===================== contacts ===================== */
+CREATE TABLE IF NOT EXISTS vacancy_contacts (
+    id TEXT PRIMARY KEY DEFAULT (lower(hex(randomblob(16)))) NOT NULL,
+    vacancy_id INTEGER NOT NULL,
+    -- Все это избыточные поля
+    vacancy_alternate_url TEXT,
+    vacancy_name TEXT,
+    vacancy_area_id INTEGER,
+    vacancy_area_name TEXT,
+    vacancy_salary_from INTEGER,
+    vacancy_salary_to INTEGER,
+    vacancy_currency VARCHAR(3),
+    vacancy_gross BOOLEAN,
+    --
+    employer_id INTEGER,
+    employer_name TEXT,
+    --
     name TEXT,
     email TEXT,
     phone_numbers TEXT NOT NULL,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-    UNIQUE (employer_id, email)
+    UNIQUE (vacancy_id, email)
 );
 /* ===================== vacancies ===================== */
 CREATE TABLE IF NOT EXISTS vacancies (
@@ -49,7 +61,8 @@ CREATE TABLE IF NOT EXISTS negotiations (
     id INTEGER PRIMARY KEY,
     state TEXT NOT NULL,
     vacancy_id INTEGER NOT NULL,
-    employer_id INTEGER NOT NULL,
+    employer_id INTEGER,
+    -- Может обнулиться при блокировке раб-о-тодателя
     chat_id INTEGER NOT NULL,
     resume_id TEXT,
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
@@ -95,10 +108,10 @@ UPDATE employers
 SET updated_at = CURRENT_TIMESTAMP
 WHERE id = OLD.id;
 END;
-CREATE TRIGGER IF NOT EXISTS trg_employer_contacts_updated
+CREATE TRIGGER IF NOT EXISTS trg_vacancy_contacts_updated
 AFTER
-UPDATE ON employer_contacts BEGIN
-UPDATE employer_contacts
+UPDATE ON vacancy_contacts BEGIN
+UPDATE vacancy_contacts
 SET updated_at = CURRENT_TIMESTAMP
 WHERE id = OLD.id;
 END;