skypro-cli-tool 0.2.0__tar.gz → 0.3.2__tar.gz

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.3
 Name: skypro-cli-tool
-Version: 0.2.0
+Version: 0.3.2
 Summary: SkyPro cli tool
 Requires-Dist: aiohttp>=3.13.5
+Requires-Dist: click>=8.4.2
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pydantic>=2.13.3
-Requires-Dist: pydantic-settings[toml]>=2.14.0
+Requires-Dist: pydantic-settings>=2.14.0
 Requires-Dist: typer>=0.25.0
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -14,13 +15,22 @@ Description-Content-Type: text/markdown
 
 ## How to start
 
-Initialise app
+Show current config
 
 ```commandline
-sky-cli init
+sky-cli config
 ```
 
-Check money you are earned this month
+Reconfigure SkyPro access
+
+```commandline
+sky-cli config --skypro
+```
+
+If SkyPro credentials are missing, the `summary` command exits with an error.
+Configure them first with `sky-cli config --skypro`.
+
+Check money you earned this month
 
 ```commandline
 sky-cli summary

skypro_cli_tool-0.3.2/README.md

@@ -0,0 +1,30 @@
+# SkyPro cli tool
+
+## How to start
+
+Show current config
+
+```commandline
+sky-cli config
+```
+
+Reconfigure SkyPro access
+
+```commandline
+sky-cli config --skypro
+```
+
+If SkyPro credentials are missing, the `summary` command exits with an error.
+Configure them first with `sky-cli config --skypro`.
+
+Check money you earned this month
+
+```commandline
+sky-cli summary
+```
+
+Another month or year
+
+```commandline
+sky-cli summary --month 3 --year 2026
+```

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/pyproject.toml

@@ -1,18 +1,24 @@
 [project]
 name = "skypro-cli-tool"
-version = "0.2.0"
+version = "0.3.2"
 description = "SkyPro cli tool"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "aiohttp>=3.13.5",
+    "click>=8.4.2",
     "httpx>=0.28.1",
     "pydantic>=2.13.3",
-    "pydantic-settings[toml]>=2.14.0",
+    "pydantic-settings>=2.14.0",
     "typer>=0.25.0",
 ]
 
 [dependency-groups]
+dev = [
+    { include-group = "test" },
+    { include-group = "lint" },
+    "ipython>=9.13.0",
+]
 test = [
     "freezegun>=1.5.5",
     "pytest>=9.0.3",
@@ -22,7 +28,9 @@ test = [
     "pytest-mock>=3.15.1",
 ]
 lint = [
+    "mypy>=2.3.0",
     "ruff>=0.15.12",
+    "typos>=1.48.0",
 ]
 
 [project.scripts]
@@ -65,6 +73,10 @@ preview = true
     "PLR2004", # Magic value used in comparison
     "RUF069", # Unreliable floating point equality comparison
 ]
+"*/cli/app.py" = [
+    "FBT001", # Boolean-typed positional argument in function definition
+    "FBT003", # Boolean positional value in function call
+]
 
 [tool.ruff.lint.isort]
 combine-as-imports = true
@@ -98,3 +110,29 @@ build-backend = "uv_build"
 [tool.uv.build-backend]
 module-name = "skypro"
 module-root = "src"
+
+[tool.mypy]
+show_error_codes = true
+ignore_missing_imports = true
+disallow_incomplete_defs = true
+disallow_untyped_defs = true
+warn_unused_ignores = true
+warn_no_return = false
+warn_unreachable = true
+no_implicit_optional = true
+allow_redefinition = true
+exclude_gitignore = true
+plugins = ["pydantic.mypy"]
+strict = true
+
+[tool.pydantic-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_required_dynamic_aliases = true
+
+[[tool.mypy.overrides]]
+module = ['tests.*']
+allow_untyped_defs = true
+disable_error_code = [
+    "no-untyped-def", #  Function is missing a type annotation
+]

skypro_cli_tool-0.3.2/src/skypro/cli/app.py

@@ -0,0 +1,55 @@
+import asyncio
+import json
+
+import typer
+from rich.console import Console
+from typer import Option
+
+from skypro.config import (
+    configure_skypro_settings,
+    enable_console_logging,
+    get_settings,
+    is_skypro_configured,
+)
+
+from . import commands
+
+app = typer.Typer()
+console = Console()
+
+
+@app.command(name='summary')
+def get_summary(
+    year: int | None = Option(None, help='Год для расчета'),
+    month: int | None = Option(None, help='Месяц для расчета'),
+    verbose: bool = typer.Option(False, '-v', '--verbose'),
+) -> None:
+    """Расчет стоимости работ"""
+    if not is_skypro_configured():
+        console.print(
+            '[red]Настройки SkyPro не заданы. '
+            'Укажите их командой `sky-cli config --skypro`.[/]'
+        )
+        raise typer.Exit(code=1)
+
+    if verbose:
+        enable_console_logging(console)
+
+    asyncio.run(commands.show_summary(console, year, month))
+
+
+@app.command(name='config')
+def configure(
+    skypro: bool = Option(
+        False,
+        '--skypro',
+        help='Изменить настройки доступа к SkyPro',
+    ),
+) -> None:
+    """Просмотр текущего конфига или настройка доступа к SkyPro"""
+    if skypro:
+        configure_skypro_settings(console)
+        return
+
+    settings = get_settings().model_dump(mode='json')
+    console.print(json.dumps(settings, ensure_ascii=False, indent=2))

skypro_cli_tool-0.3.2/src/skypro/cli/commands/__init__.py

@@ -0,0 +1,3 @@
+from .summary import show_summary
+
+__all__ = ('show_summary',)

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/cli/commands/summary.py

@@ -1,5 +1,5 @@
 from calendar import IllegalMonthError
-from datetime import UTC, date, datetime
+from datetime import UTC, datetime
 
 from click.exceptions import Exit
 from rich.console import Console
@@ -8,7 +8,6 @@ from skypro.cli.renders import render_summary_table
 from skypro.domain.errors import DomainError
 from skypro.infra.repositories.errors import RepositoryError
 from skypro.use_cases import get_summary_info
-from skypro.utils import get_month_range
 
 
 async def show_summary(
@@ -16,23 +15,16 @@ async def show_summary(
     year: int | None,
     month: int | None,
 ) -> None:
-    try:
-        start, end = resolve_period(year, month)
+    now = datetime.now(UTC).astimezone()
+    year = year or now.year
+    month = month or now.month
 
+    try:
         with console.status('[cyan]Расчет стоимости работ'):
-            report, total, after_tax = await get_summary_info(start, end)
+            report, total, after_tax = await get_summary_info(year, month)
 
         table = render_summary_table(report, total, after_tax)
         console.print(table)
     except (RepositoryError, DomainError, IllegalMonthError) as e:
         console.print(f'[bold red]Error: {e!s}[/]')
         raise Exit(code=1) from e
-
-
-def resolve_period(year: int | None, month: int | None) -> tuple[date, date]:
-    now = datetime.now(UTC).astimezone()
-    target_year = year or now.year
-    target_month = month or now.month
-
-    start, end = get_month_range(target_year, target_month)
-    return start, end

skypro_cli_tool-0.3.2/src/skypro/config/__init__.py

@@ -0,0 +1,18 @@
+from .logging import configure_logging, enable_console_logging
+from .service import (
+    configure_skypro_settings,
+    ensure_skypro_configured,
+    is_skypro_configured,
+)
+from .settings import BASE_DIR, get_settings, save_settings
+
+__all__ = (
+    'BASE_DIR',
+    'configure_logging',
+    'configure_skypro_settings',
+    'enable_console_logging',
+    'ensure_skypro_configured',
+    'get_settings',
+    'is_skypro_configured',
+    'save_settings',
+)

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/config/logging.py

@@ -1,15 +1,16 @@
 import logging
 import logging.config
 from functools import cache
+from typing import Any
 
 from rich.console import Console
 from rich.logging import RichHandler
 
-from .settings import BASE_DIR, settings
+from .settings import HOME_DIR, get_settings
 
-LOG_DIR = BASE_DIR / 'logs'
+LOG_DIR = HOME_DIR / 'logs'
 
-LOGGING_CONFIG = {
+LOGGING_CONFIG: dict[str, Any] = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
@@ -27,10 +28,7 @@ LOGGING_CONFIG = {
             'formatter': 'formatter',
         },
     },
-    'root': {
-        'handlers': ['file'],
-        'level': settings.log_level,
-    },
+    'root': {'handlers': ['file']},
     'loggers': {
         'httpx': {'handlers': ['file'], 'level': logging.WARNING, 'propagate': True},
     },
@@ -39,7 +37,8 @@ LOGGING_CONFIG = {
 
 @cache
 def configure_logging() -> None:
-    LOG_DIR.mkdir(exist_ok=True)
+    LOG_DIR.mkdir(mode=0o700, exist_ok=True, parents=True)
+    LOGGING_CONFIG['root']['level'] = get_settings().log_level.upper()
     logging.config.dictConfig(LOGGING_CONFIG)
 
 

skypro_cli_tool-0.3.2/src/skypro/config/service.py

@@ -0,0 +1,44 @@
+from pydantic import SecretStr
+from rich.console import Console
+
+from .settings import Settings, get_settings, save_settings
+
+
+def is_skypro_configured(settings: Settings | None = None) -> bool:
+    current_settings = settings or get_settings()
+    return bool(current_settings.skypro.email and current_settings.skypro.password)
+
+
+def configure_skypro_settings(console: Console) -> Settings:
+    current_settings = get_settings()
+
+    console.print('[cyan]Настройка доступа к SkyPro[/]')
+
+    current_email = current_settings.skypro.email or ''
+    email_prompt = 'Email'
+    if current_email:
+        email_prompt = f'Email [{current_email}]'
+
+    email = console.input(f'{email_prompt}: ').strip() or current_email
+    password = console.input('Password: ', password=True).strip()
+    if not password and current_settings.skypro.password:
+        password = current_settings.skypro.password_value
+
+    updated_settings = current_settings.model_copy(
+        update={
+            'skypro': current_settings.skypro.model_copy(
+                update={'email': email, 'password': SecretStr(password)}
+            )
+        }
+    )
+    save_settings(updated_settings)
+    return updated_settings
+
+
+def ensure_skypro_configured(console: Console) -> Settings:
+    settings = get_settings()
+    if is_skypro_configured(settings):
+        return settings
+
+    console.print('[yellow]Конфигурация SkyPro не найдена. Заполним ее сейчас.[/]')
+    return configure_skypro_settings(console)

skypro_cli_tool-0.3.2/src/skypro/config/settings.py

@@ -0,0 +1,62 @@
+import json
+from functools import cache
+from pathlib import Path
+from typing import Literal
+
+from pydantic import BaseModel, Field, SecretStr
+from pydantic_settings import (
+    BaseSettings,
+    JsonConfigSettingsSource,
+    PydanticBaseSettingsSource,
+)
+
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+HOME_DIR = Path.home() / '.skypro'
+
+SETTINGS_FILE_PATH = HOME_DIR / 'settings.json'
+
+
+class SkyProSettings(BaseModel):
+    email: str | None = None
+    password: SecretStr | None = None
+
+    @property
+    def password_value(self) -> str:
+        if not self.password:
+            raise RuntimeError('Password does not set')
+
+        return self.password.get_secret_value()
+
+
+class Settings(BaseSettings, json_file=SETTINGS_FILE_PATH):
+    tax_percent: float = 6.0
+    default_request_timeout: int = 3
+    log_level: Literal['debug', 'info'] = 'info'
+
+    skypro: SkyProSettings = Field(default_factory=SkyProSettings)
+
+    @classmethod
+    def settings_customise_sources(  # type: ignore[override]
+        cls,
+        settings_cls: type[BaseSettings],
+        **_: PydanticBaseSettingsSource,
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
+        return (JsonConfigSettingsSource(settings_cls),)
+
+
+def save_settings(settings: Settings) -> None:
+    SETTINGS_FILE_PATH.parent.mkdir(mode=0o700, exist_ok=True)
+
+    data = settings.model_dump(mode='json')
+    data['skypro']['password'] = settings.skypro.password_value
+
+    with SETTINGS_FILE_PATH.open(mode='w', encoding='utf-8') as f:
+        json.dump(data, f, ensure_ascii=False, indent=2)
+
+    get_settings.cache_clear()
+
+
+@cache
+def get_settings() -> Settings:
+    return Settings()

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/domain/services.py

@@ -1,6 +1,5 @@
 from decimal import Decimal
 
-from skypro.config.settings import settings
 from skypro.domain.errors import MissingWorkPriceError
 from skypro.domain.models import WorkPrice, WorkReportItem, WorkSummary
 
@@ -32,6 +31,6 @@ def calculate_total(report: list[WorkReportItem]) -> Decimal:
     return sum((item.total for item in report), Decimal(0))
 
 
-def apply_tax(amount: Decimal) -> Decimal:
-    tax_rate = Decimal(str(settings.tax_percent)) / Decimal(100)
+def apply_tax(amount: Decimal, tax_percent: float) -> Decimal:
+    tax_rate = Decimal(str(tax_percent)) / Decimal(100)
     return amount * (Decimal(1) - tax_rate)

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/infra/api/skypro/client.py

@@ -1,7 +1,7 @@
 import logging
 from datetime import date
 
-from skypro.config.settings import settings
+from skypro.config import get_settings
 from skypro.infra.api.base import BaseApiClient
 from skypro.infra.api.errors import AuthenticationError
 from skypro.infra.http.client import HttpClient
@@ -52,8 +52,8 @@ class SkyProClient(BaseApiClient):
         response = await self._post(
             self.login_url,
             data={
-                'email': settings.skypro.email,
-                'password': settings.skypro.password,
+                'email': get_settings().skypro.email,
+                'password': get_settings().skypro.password_value,
                 'csrfmiddlewaretoken': csrf_token,
             },
             headers={'Referer': str(self.cookies)},

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/infra/api/skypro/dto.py

@@ -9,5 +9,10 @@ class ServiceSummary(BaseModel, populate_by_name=True):
     individual_consultation: int = Field(0, alias='ИК', ge=0)
 
 
+class ServiceByProfession(BaseModel):
+    profession: str
+    services: ServiceSummary
+
+
 class AccountDataResponse(BaseModel):
-    services_summary: ServiceSummary
+    services_by_profession: list[ServiceByProfession]

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/infra/http/client.py

@@ -5,7 +5,7 @@ from typing import Any, Self
 import httpx
 from httpx import AsyncClient, Request, Response
 
-from skypro.config.settings import settings
+from skypro.config import get_settings
 
 from .errors import HttpError
 
@@ -15,7 +15,7 @@ logger = logging.getLogger(__name__)
 class HttpClient:
     def __init__(self, timeout: int | None = None) -> None:
         self._client = AsyncClient(
-            timeout=timeout or settings.default_request_timeout,
+            timeout=timeout or get_settings().default_request_timeout,
             follow_redirects=True,
             event_hooks={'request': [_log_request], 'response': [_log_response]},
         )

skypro_cli_tool-0.3.2/src/skypro/infra/repositories/summary.py

@@ -0,0 +1,55 @@
+import logging
+from collections import defaultdict
+from datetime import date
+from itertools import starmap
+
+from pydantic import ValidationError
+
+from skypro.domain.enums import WorkType
+from skypro.domain.models import WorkSummary
+from skypro.infra.api.errors import ApiError, AuthenticationError
+from skypro.infra.api.skypro.client import SkyProClient
+from skypro.infra.api.skypro.dto import ServiceByProfession, ServiceSummary
+from skypro.infra.http.client import HttpClient
+from skypro.infra.http.errors import HttpError
+from skypro.infra.repositories.errors import SummaryLoadError
+
+logger = logging.getLogger(__name__)
+
+
+async def get_summary(start_date: date, end_date: date) -> list[WorkSummary]:
+    try:
+        async with HttpClient() as http_client:
+            skypro = SkyProClient(http_client)
+            account_data = await skypro.get_account_data(start_date, end_date)
+    except AuthenticationError as e:
+        message = 'SkyPro authentication failed. Check email and password.'
+        raise SummaryLoadError(message) from e
+    except (HttpError, ApiError, ValidationError) as e:
+        raise SummaryLoadError(str(e) or 'Failed to load summary from SkyPro.') from e
+
+    return _get_summary_by_service_by_profession(*account_data.services_by_profession)
+
+
+def _get_summary_by_service_by_profession(
+    *services_by_profession: ServiceByProfession,
+) -> list[WorkSummary]:
+    work_summary: dict[WorkType, int] = defaultdict(int)
+
+    for sbp in services_by_profession:
+        logger.debug('Calculate work summary by %r', sbp.profession)
+        for summary in _get_summary_by_service_summary(sbp.services):
+            work_summary[summary.work_type] += summary.quantity
+    return list(starmap(WorkSummary, work_summary.items()))
+
+
+def _get_summary_by_service_summary(
+    service_summary: ServiceSummary,
+) -> list[WorkSummary]:
+    return [
+        WorkSummary(WorkType.HOMEWORK, service_summary.homework),
+        WorkSummary(WorkType.COURSEWORK, service_summary.coursework),
+        WorkSummary(WorkType.DIPLOMA, service_summary.diploma),
+        WorkSummary(WorkType.LIVE, service_summary.live),
+        WorkSummary(WorkType.CONSULTATION, service_summary.individual_consultation),
+    ]

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/infra/repositories/work.py

@@ -1,7 +1,7 @@
 import json
 from decimal import Decimal, InvalidOperation
 
-from skypro.config.settings import BASE_DIR
+from skypro.config import BASE_DIR
 from skypro.domain.enums import WorkType
 from skypro.domain.models import WorkPrice
 

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/main.py

@@ -1,7 +1,7 @@
 import locale
 
 from skypro.cli.app import app
-from skypro.config.logging import configure_logging
+from skypro.config import configure_logging
 
 
 def main() -> None:

{skypro_cli_tool-0.2.0 → skypro_cli_tool-0.3.2}/src/skypro/use_cases/get_summary_info.py

@@ -1,12 +1,13 @@
 import asyncio
 from asyncio import gather
-from datetime import date
 from decimal import Decimal
 from typing import NamedTuple
 
+from skypro.config import get_settings
 from skypro.domain.models import WorkReportItem
 from skypro.domain.services import apply_tax, build_work_report, calculate_total
 from skypro.infra.repositories import get_summary, get_works_prices
+from skypro.utils import get_month_range
 
 
 class SummaryInfo(NamedTuple):
@@ -15,7 +16,9 @@ class SummaryInfo(NamedTuple):
     total_after_tax: Decimal
 
 
-async def get_summary_info(start_date: date, end_date: date) -> SummaryInfo:
+async def get_summary_info(year: int, month: int) -> SummaryInfo:
+    start_date, end_date = get_month_range(year, month)
+
     work_prices, work_summaries = await gather(
         asyncio.to_thread(get_works_prices),
         get_summary(start_date, end_date),
@@ -23,6 +26,6 @@ async def get_summary_info(start_date: date, end_date: date) -> SummaryInfo:
 
     report = build_work_report(work_prices, work_summaries)
     total = calculate_total(report)
-    total_after_tax = apply_tax(total)
+    total_after_tax = apply_tax(total, get_settings().tax_percent)
 
     return SummaryInfo(report, total, total_after_tax)

skypro_cli_tool-0.2.0/README.md

@@ -1,21 +0,0 @@
-# SkyPro cli tool
-
-## How to start
-
-Initialise app
-
-```commandline
-sky-cli init
-```
-
-Check money you are earned this month
-
-```commandline
-sky-cli summary
-```
-
-Another month or year
-
-```commandline
-sky-cli summary --month 3 --year 2026
-```

skypro_cli_tool-0.2.0/src/skypro/cli/app.py

@@ -1,33 +0,0 @@
-import asyncio
-
-import typer
-from rich.console import Console
-from typer import Option
-
-from skypro.config.logging import enable_console_logging
-
-from . import commands
-from .commands import initialize_settings
-
-app = typer.Typer()
-console = Console()
-
-
-@app.command(name='summary')
-def get_summary(
-    year: int | None = Option(None, help='Год для расчета'),
-    month: int | None = Option(None, help='Месяц для расчета'),
-    *,
-    verbose: bool = typer.Option(False, '-v', '--verbose'),  # noqa: FBT003
-) -> None:
-    """Расчет стоимости работ"""
-    if verbose:
-        enable_console_logging(console)
-    asyncio.run(commands.show_summary(console, year, month))
-
-
-@app.command(name='init')
-def init_settings() -> None:
-    """Установка настроек."""
-    asyncio.run(initialize_settings(console))
-    console.print('[green]OK[/]')

skypro_cli_tool-0.2.0/src/skypro/cli/commands/__init__.py

@@ -1,4 +0,0 @@
-from .initialize import initialize_settings
-from .summary import show_summary
-
-__all__ = ('initialize_settings', 'show_summary')