flru-parser 0.3.1__tar.gz → 0.3.2__tar.gz

{flru_parser-0.3.1 → flru_parser-0.3.2}/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes are documented here. The project follows [Semantic Versionin
 
 ## [Unreleased]
 
+## [0.3.2] - 2026-07-26
+
+### Fixed
+
+- Parse current FL.ru catalog cards as complete cards instead of mistaking title elements
+  for card containers, restoring descriptions, budgets, kinds, and other card fields.
+- Follow FL.ru's `/projects/page-N/` pagination so `pages="all"` traverses the catalog.
+- Default the high-level projects APIs to orders (`kind=1`), preventing vacancies from
+  appearing among orders unless explicitly requested through `types`.
+- Keep package and parser metadata versions synchronized.
+
 ## [0.3.1] - 2026-07-26
 
 ### Added

{flru_parser-0.3.1 → flru_parser-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flru-parser
-Version: 0.3.1
+Version: 0.3.2
 Summary: Simple, typed and resilient async/sync parser client for public FL.ru pages
 Author: Andrey
 License-Expression: MIT
@@ -27,6 +27,7 @@ Requires-Dist: beautifulsoup4<5,>=4.12
 Requires-Dist: httpx[http2]<1,>=0.28
 Requires-Dist: lxml<7,>=5
 Requires-Dist: pydantic<3,>=2.10
+Requires-Dist: tzdata>=2025.2
 Provides-Extra: postgres
 Requires-Dist: asyncpg<1,>=0.30; extra == "postgres"
 Provides-Extra: redis
@@ -43,9 +44,8 @@ Dynamic: license-file
 [![Python](https://img.shields.io/pypi/pyversions/flru-parser.svg)](https://pypi.org/project/flru-parser/)
 [![License](https://img.shields.io/pypi/l/flru-parser.svg)](LICENSE)
 [![Typing](https://img.shields.io/badge/typing-PEP%20561-blue)](src/flru/py.typed)
-[![Coverage](https://img.shields.io/badge/branch%20coverage-85.76%25-brightgreen)](#quality)
-[![Tests](https://img.shields.io/badge/tests-47%20passed-brightgreen)](#quality)
-[![CI](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml)
+[![Tests](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml?query=branch%3Amain)
+[![Codecov](https://codecov.io/gh/N3ffus/flru-parser/branch/main/graph/badge.svg)](https://codecov.io/gh/N3ffus/flru-parser/branch/main)
 
 A typed, resilient, read-only Python client for public pages on [FL.ru](https://www.fl.ru/).
 The default API is intentionally small; production controls remain available when needed.
@@ -370,13 +370,7 @@ Install `flru-parser[observability]` before using these adapters.
 
 ## Quality
 
-Current verified result for **0.3.0**:
-
-```text
-47 passed, 1 optional Hypothesis suite skipped locally
-Branch coverage: 85.76%
-Coverage gate: 85%
-```
+The CI and Codecov badges above always show the current `main` result.
 
 Run the complete local checks:
 
@@ -404,8 +398,8 @@ The release workflow uses PyPI Trusted Publishing and checks that the Git tag ma
 
 ```bash
 uv run python scripts/configure_project.py YOUR_GITHUB_USERNAME
-git tag -a v0.3.0 -m "flru-parser 0.3.0"
-git push origin main v0.3.0
+git tag -a v0.3.2 -m "flru-parser 0.3.2"
+git push origin main v0.3.2
 ```
 
 See [docs/PUBLISHING.md](docs/PUBLISHING.md) for the one-time PyPI and GitHub setup.

{flru_parser-0.3.1 → flru_parser-0.3.2}/README.md

@@ -4,9 +4,8 @@
 [![Python](https://img.shields.io/pypi/pyversions/flru-parser.svg)](https://pypi.org/project/flru-parser/)
 [![License](https://img.shields.io/pypi/l/flru-parser.svg)](LICENSE)
 [![Typing](https://img.shields.io/badge/typing-PEP%20561-blue)](src/flru/py.typed)
-[![Coverage](https://img.shields.io/badge/branch%20coverage-85.76%25-brightgreen)](#quality)
-[![Tests](https://img.shields.io/badge/tests-47%20passed-brightgreen)](#quality)
-[![CI](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml)
+[![Tests](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml?query=branch%3Amain)
+[![Codecov](https://codecov.io/gh/N3ffus/flru-parser/branch/main/graph/badge.svg)](https://codecov.io/gh/N3ffus/flru-parser/branch/main)
 
 A typed, resilient, read-only Python client for public pages on [FL.ru](https://www.fl.ru/).
 The default API is intentionally small; production controls remain available when needed.
@@ -331,13 +330,7 @@ Install `flru-parser[observability]` before using these adapters.
 
 ## Quality
 
-Current verified result for **0.3.0**:
-
-```text
-47 passed, 1 optional Hypothesis suite skipped locally
-Branch coverage: 85.76%
-Coverage gate: 85%
-```
+The CI and Codecov badges above always show the current `main` result.
 
 Run the complete local checks:
 
@@ -365,8 +358,8 @@ The release workflow uses PyPI Trusted Publishing and checks that the Git tag ma
 
 ```bash
 uv run python scripts/configure_project.py YOUR_GITHUB_USERNAME
-git tag -a v0.3.0 -m "flru-parser 0.3.0"
-git push origin main v0.3.0
+git tag -a v0.3.2 -m "flru-parser 0.3.2"
+git push origin main v0.3.2
 ```
 
 See [docs/PUBLISHING.md](docs/PUBLISHING.md) for the one-time PyPI and GitHub setup.

{flru_parser-0.3.1 → flru_parser-0.3.2}/docs/PUBLISHING.md

@@ -34,7 +34,7 @@ uv pip install \
   --python /tmp/flru-test/bin/python \
   --index-url https://test.pypi.org/simple/ \
   --extra-index-url https://pypi.org/simple/ \
-  flru-parser==0.3.0
+  flru-parser==0.3.2
 ```
 
 On Windows, use `/tmp/flru-test/Scripts/python.exe` instead.
@@ -47,8 +47,8 @@ On Windows, use `/tmp/flru-test/Scripts/python.exe` instead.
 4. Commit, create an annotated tag, and push it:
 
 ```bash
-git tag -a v0.3.0 -m "flru-parser 0.3.0"
-git push origin main v0.3.0
+git tag -a v0.3.2 -m "flru-parser 0.3.2"
+git push origin main v0.3.2
 ```
 
 The workflow builds distributions once, validates them, and publishes the exact same artifacts through PyPI Trusted Publishing.

{flru_parser-0.3.1 → flru_parser-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flru-parser"
-version = "0.3.1"
+version = "0.3.2"
 description = "Simple, typed and resilient async/sync parser client for public FL.ru pages"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -17,6 +17,7 @@ dependencies = [
   "httpx[http2]>=0.28,<1",
   "lxml>=5,<7",
   "pydantic>=2.10,<3",
+  "tzdata>=2025.2",
 ]
 classifiers = [
   "Development Status :: 4 - Beta",

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/__init__.py

@@ -67,7 +67,7 @@ from .state import (
     project_content_hash,
 )
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 AsyncClient = Client
 

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/client.py

@@ -22,7 +22,7 @@ from .exceptions import (
     RobotsDeniedError,
     SelectorDriftError,
 )
-from .filters import ProjectFilters
+from .filters import ProjectFilters, ProjectType
 from .models import (
     Category,
     CrawlCheckpoint,
@@ -31,6 +31,7 @@ from .models import (
     PageData,
     PortfolioItem,
     ProjectDetail,
+    ProjectKind,
     ProjectPage,
     ProjectSummary,
     RequestMetrics,
@@ -199,6 +200,14 @@ class FLClient:
                 timezone_name=self.config.parser_timezone,
             )
             self._validate_project_page(result)
+            if filters and filters.project_types:
+                kind_map = {
+                    ProjectType.ORDER: ProjectKind.ORDER,
+                    ProjectType.VACANCY: ProjectKind.VACANCY,
+                    ProjectType.CONTEST: ProjectKind.CONTEST,
+                }
+                requested = {kind_map[item] for item in filters.project_types}
+                result.items = [item for item in result.items if item.kind in requested]
             return result
         except ParseError as exc:
             await self._record_parse_failure(effective_url, html, exc)
@@ -335,6 +344,16 @@ class FLClient:
         fail_fast: bool = True,
     ) -> AsyncIterator[ProjectSummary]:
         seen: set[int] = set()
+        allowed_kinds = {
+            ProjectType.ORDER: ProjectKind.ORDER,
+            ProjectType.VACANCY: ProjectKind.VACANCY,
+            ProjectType.CONTEST: ProjectKind.CONTEST,
+        }
+        requested_kinds = (
+            {allowed_kinds[item] for item in filters.project_types}
+            if filters and filters.project_types
+            else set()
+        )
         async for page in self.iter_project_pages(
             start_page=start_page,
             max_pages=max_pages,
@@ -345,6 +364,11 @@ class FLClient:
             fail_fast=fail_fast,
         ):
             for item in page.items:
+                # FL.ru can include pinned cards of another kind even when a
+                # `kind` filter is present, so enforce the requested kinds
+                # locally as well.
+                if requested_kinds and item.kind not in requested_kinds:
+                    continue
                 if deduplicate and item.id in seen:
                     continue
                 seen.add(item.id)

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/easy.py

@@ -444,12 +444,18 @@ def _project_filters(
     types: ProjectTypeInput,
     with_budget: bool | None,
 ) -> ProjectFilters:
+    # The public "projects" API represents FL.ru orders.  FL.ru's unfiltered
+    # catalog also contains vacancies and contests, so request orders unless
+    # callers explicitly select one or more kinds.
+    project_types = _normalize_project_types(types)
+    if types is None:
+        project_types = frozenset({ProjectType.ORDER})
     return ProjectFilters(
         query=query,
         category=category,
         budget_from=min_budget,
         budget_to=max_budget,
-        project_types=_normalize_project_types(types),
+        project_types=project_types,
         only_with_budget=with_budget,
     )
 

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/models.py

@@ -7,7 +7,7 @@ from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
-PARSER_VERSION = "0.3.0"
+PARSER_VERSION = "0.3.2"
 SCHEMA_VERSION = "1"
 
 

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/parsers/projects.py

@@ -39,7 +39,7 @@ from .common import (
 
 TITLE_SELECTORS = ("h1", '[itemprop="name"]', ".b-page__title", ".project-title")
 DESCRIPTION_SELECTORS = (
-    '[itemprop="description"]', ".b-layout__txt_padbot_20", ".b-post__txt",
+    '[itemprop="description"]', ".b-layout__txt_padbot_20", ".b-post__txt.text-5",
     ".project-description", '[class*="description"]',
 )
 
@@ -48,8 +48,12 @@ def _find_card(anchor: Tag) -> Tag:
     for parent in anchor.parents:
         if not isinstance(parent, Tag):
             continue
-        classes = " ".join(parent.get("class", []))
-        if parent.name == "article" or re.search(r"(?:^|[-_ ])(?:project|b-post)(?:[-_ ]|$)", classes):
+        classes = set(parent.get("class", []))
+        if (
+            parent.name == "article"
+            or classes.intersection({"b-post", "project-card", "project", "catalog-item"})
+            or str(parent.get("data-id", "")).startswith("qa-lenta-")
+        ):
             return parent
         if parent.name in {"main", "body"}:
             break
@@ -124,7 +128,10 @@ def _next_page_url(soup: BeautifulSoup, url: str, page: int) -> str | None:
         return absolute_url(url, str(explicit.get("href")))
     for anchor in soup.select("a[href]"):
         href = absolute_url(url, str(anchor.get("href")))
-        if href and parse_qs(urlsplit(href).query).get("page") == [str(page + 1)]:
+        if href and (
+            parse_qs(urlsplit(href).query).get("page") == [str(page + 1)]
+            or re.search(rf"/page-{page + 1}/?$", urlsplit(href).path)
+        ):
             return href
     return None
 

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru/security.py

@@ -33,9 +33,7 @@ def redact_url(url: str | None) -> str | None:
     parts = urlsplit(url)
     hostname = parts.hostname or ""
     port = f":{parts.port}" if parts.port else ""
-    userinfo = ""
-    if parts.username:
-        userinfo = f"{parts.username}:***@"
+    userinfo = "***@" if parts.username else ""
     netloc = f"{userinfo}{hostname}{port}"
     query = _SECRET_QUERY_RE.sub(lambda match: f"{match.group(1)}=***", parts.query)
     return urlunsplit(SplitResult(parts.scheme, netloc, parts.path, query, parts.fragment))

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flru-parser
-Version: 0.3.1
+Version: 0.3.2
 Summary: Simple, typed and resilient async/sync parser client for public FL.ru pages
 Author: Andrey
 License-Expression: MIT
@@ -27,6 +27,7 @@ Requires-Dist: beautifulsoup4<5,>=4.12
 Requires-Dist: httpx[http2]<1,>=0.28
 Requires-Dist: lxml<7,>=5
 Requires-Dist: pydantic<3,>=2.10
+Requires-Dist: tzdata>=2025.2
 Provides-Extra: postgres
 Requires-Dist: asyncpg<1,>=0.30; extra == "postgres"
 Provides-Extra: redis
@@ -43,9 +44,8 @@ Dynamic: license-file
 [![Python](https://img.shields.io/pypi/pyversions/flru-parser.svg)](https://pypi.org/project/flru-parser/)
 [![License](https://img.shields.io/pypi/l/flru-parser.svg)](LICENSE)
 [![Typing](https://img.shields.io/badge/typing-PEP%20561-blue)](src/flru/py.typed)
-[![Coverage](https://img.shields.io/badge/branch%20coverage-85.76%25-brightgreen)](#quality)
-[![Tests](https://img.shields.io/badge/tests-47%20passed-brightgreen)](#quality)
-[![CI](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml)
+[![Tests](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/N3ffus/flru-parser/actions/workflows/ci.yml?query=branch%3Amain)
+[![Codecov](https://codecov.io/gh/N3ffus/flru-parser/branch/main/graph/badge.svg)](https://codecov.io/gh/N3ffus/flru-parser/branch/main)
 
 A typed, resilient, read-only Python client for public pages on [FL.ru](https://www.fl.ru/).
 The default API is intentionally small; production controls remain available when needed.
@@ -370,13 +370,7 @@ Install `flru-parser[observability]` before using these adapters.
 
 ## Quality
 
-Current verified result for **0.3.0**:
-
-```text
-47 passed, 1 optional Hypothesis suite skipped locally
-Branch coverage: 85.76%
-Coverage gate: 85%
-```
+The CI and Codecov badges above always show the current `main` result.
 
 Run the complete local checks:
 
@@ -404,8 +398,8 @@ The release workflow uses PyPI Trusted Publishing and checks that the Git tag ma
 
 ```bash
 uv run python scripts/configure_project.py YOUR_GITHUB_USERNAME
-git tag -a v0.3.0 -m "flru-parser 0.3.0"
-git push origin main v0.3.0
+git tag -a v0.3.2 -m "flru-parser 0.3.2"
+git push origin main v0.3.2
 ```
 
 See [docs/PUBLISHING.md](docs/PUBLISHING.md) for the one-time PyPI and GitHub setup.

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru_parser.egg-info/SOURCES.txt

@@ -53,6 +53,7 @@ src/flru_parser.egg-info/requires.txt
 src/flru_parser.egg-info/top_level.txt
 tests/test_api_extensions.py
 tests/test_client.py
+tests/test_client_easy_edges.py
 tests/test_diagnostics_and_common.py
 tests/test_easy_api.py
 tests/test_freelancers.py

{flru_parser-0.3.1 → flru_parser-0.3.2}/src/flru_parser.egg-info/requires.txt

@@ -2,6 +2,7 @@ beautifulsoup4<5,>=4.12
 httpx[http2]<1,>=0.28
 lxml<7,>=5
 pydantic<3,>=2.10
+tzdata>=2025.2
 
 [observability]
 opentelemetry-api<2,>=1.29

flru_parser-0.3.2/tests/test_client_easy_edges.py

@@ -0,0 +1,147 @@
+from __future__ import annotations
+
+from datetime import datetime, timezone
+from pathlib import Path
+from unittest.mock import AsyncMock
+
+import httpx
+import pytest
+
+from flru import ClientConfig, FLClient, ProjectFilters, ProjectKind, ProjectSummary, ProjectType
+from flru.easy import (
+    Client,
+    _normalize_cookies,
+    _normalize_page_count,
+    _normalize_project_types,
+    _normalize_proxies,
+    _project_filters,
+    _state_store,
+    _validate_start_page,
+)
+from flru.exceptions import BlockedError, EmptyPageError, SelectorDriftError
+from flru.models import ParseDiagnostics, ProjectPage
+
+
+def _page(*, page: int = 1, has_next: bool = False, items: list[ProjectSummary] | None = None) -> ProjectPage:
+    return ProjectPage(
+        page=page,
+        url="https://www.fl.ru/projects/",
+        items=items or [],
+        has_next=has_next,
+        diagnostics=ParseDiagnostics(page_fingerprint="test"),
+    )
+
+
+def test_easy_normalizers_and_validation(tmp_path: Path) -> None:
+    assert _normalize_proxies(None) == ()
+    assert _normalize_proxies("http://proxy") == ("http://proxy",)
+    assert _normalize_proxies(["a", "b"]) == ("a", "b")
+    assert _normalize_cookies(None) == {}
+    assert _normalize_cookies({"session": "value"}) == {"session": "value"}
+    assert _normalize_page_count("all") is None
+    assert _normalize_page_count(2) == 2
+    for value in (0, True, "two"):
+        with pytest.raises(ValueError):
+            _normalize_page_count(value)  # type: ignore[arg-type]
+    for value in (0, True):
+        with pytest.raises(ValueError):
+            _validate_start_page(value)
+    assert _normalize_project_types(["order", "ВАКАНСИЯ"])
+    default_filters = _project_filters(
+        query=None,
+        category=None,
+        min_budget=None,
+        max_budget=None,
+        types=None,
+        with_budget=None,
+    )
+    assert default_filters.to_params()["kind"] == ["1"]
+    with pytest.raises(ValueError, match="unknown project type"):
+        _normalize_project_types("other")
+    store, owned = _state_store(tmp_path / "state.db")
+    assert owned
+    assert store is not None
+
+
+def test_client_url_and_response_helpers() -> None:
+    client = FLClient(ClientConfig())
+    assert client._absolute("projects/") == "https://www.fl.ru/projects/"
+    assert client._projects_url(None).endswith("/projects/")
+    assert client._projects_url("projects/category/dev").endswith("/projects/category/dev/")
+    assert client._projects_url("https://example.test/x") == "https://example.test/x"
+    assert client._freelancers_url(None, 2).endswith("/freelancers/page-2/")
+    assert client._freelancers_url("https://example.test/team", 2).endswith("/team/page-2/")
+    assert client._project_url(12).endswith("/projects/12/")
+    assert client._username("https://www.fl.ru/users/name/") == "name"
+    with pytest.raises(ValueError):
+        client._username("https://www.fl.ru/no-user/")
+    assert client._page_number("https://x/?page=4") == 4
+    assert client._page_number("https://x/page-3/") == 3
+    assert client._page_number(None) is None
+    assert client._endpoint("https://x/projects/1") == "projects"
+    assert client._endpoint("https://x/") == "root"
+    assert client._url_with_params("https://x", {"a": [1, 2]}) == "https://x?a=1&a=2"
+    response = httpx.Response(200, headers={"Date": "invalid"})
+    assert FLClient._response_datetime(response).tzinfo is not None
+    dated = httpx.Response(200, headers={"Date": "Sat, 25 Jul 2026 12:00:00 GMT"})
+    assert FLClient._response_datetime(dated) == datetime(2026, 7, 25, 12, tzinfo=timezone.utc)
+
+
+@pytest.mark.asyncio
+async def test_client_iteration_errors_and_validation() -> None:
+    client = FLClient(ClientConfig(respect_robots_txt=False))
+    with pytest.raises(ValueError, match="batch_size"):
+        _ = [page async for page in client.iter_project_pages(batch_size=0)]
+
+    client.get_projects_batch_result = AsyncMock(return_value=type("Batch", (), {"failed": [], "successful": []})())  # type: ignore[method-assign]
+    assert [page async for page in client.iter_project_pages(max_pages=1)] == []
+
+    order = ProjectSummary(
+        id=1,
+        title="order",
+        url="https://www.fl.ru/projects/1/",
+        kind=ProjectKind.ORDER,
+    )
+    vacancy = ProjectSummary(
+        id=2,
+        title="vacancy",
+        url="https://www.fl.ru/projects/2/",
+        kind=ProjectKind.VACANCY,
+    )
+    client.iter_project_pages = lambda **_: _async_pages(_page(items=[order, vacancy]))  # type: ignore[method-assign]
+    filtered = [
+        item
+        async for item in client.iter_projects(
+            filters=ProjectFilters(project_types=frozenset({ProjectType.ORDER}))
+        )
+    ]
+    assert filtered == [order]
+
+    empty = _page()
+    with pytest.raises(EmptyPageError):
+        client._validate_project_page(empty)
+    drift = _page()
+    drift.diagnostics.candidate_links_found = 1
+    with pytest.raises(SelectorDriftError):
+        client._validate_project_page(drift)
+    accepted = _page(items=[ProjectSummary(id=1, title="x", url="https://www.fl.ru/projects/1/")])
+    client._validate_project_page(accepted)
+    await client.close()
+
+
+async def _async_pages(*pages: ProjectPage):  # type: ignore[no-untyped-def]
+    for page in pages:
+        yield page
+
+
+@pytest.mark.asyncio
+async def test_simple_client_delegates_single_page_and_details() -> None:
+    api = Client(respect_robots_txt=False)
+    item = ProjectSummary(id=1, title="x", url="https://www.fl.ru/projects/1/")
+    api.get_projects = AsyncMock(return_value=[item])  # type: ignore[method-assign]
+    api.get_project_details_result = AsyncMock(return_value=type("Result", (), {"successful": [item], "raise_for_errors": lambda self: None})())  # type: ignore[method-assign]
+    assert await api.projects() == [item]
+    assert await api.projects(details=True) == [item]
+    with pytest.raises(ValueError, match="pages"):
+        await api.user("name", pages=0)
+    await api.close()

{flru_parser-0.3.1 → flru_parser-0.3.2}/tests/test_easy_api.py

@@ -84,7 +84,7 @@ async def test_simple_details_stream_user_and_freelancers() -> None:
         freelancers = await api.freelancers()
 
     assert details and details[0].full_description
-    assert len(streamed) == 2
+    assert len(streamed) == 1
     assert project.id == 5500001
     assert user.projects and user.reviews and user.portfolio
     assert freelancers[0].username == "dev-one"
@@ -97,7 +97,7 @@ async def test_simple_incremental_and_one_shot() -> None:
         first = await api.new_projects(state, pages=2)
         second = await api.new_projects(state, pages=2, stop_after_known=1)
 
-    assert len(first) == 2
+    assert len(first) == 1
     assert second == []
 
     projects = await fetch_projects(
@@ -108,7 +108,7 @@ async def test_simple_incremental_and_one_shot() -> None:
             "transport": httpx.MockTransport(router),
         }
     )
-    assert len(projects) == 2
+    assert len(projects) == 1
 
 
 
@@ -154,7 +154,7 @@ def test_sync_simple_api() -> None:
         projects = api.projects()
         project = api.project(5500001)
 
-    assert len(projects) == 2
+    assert len(projects) == 1
     assert project.id == 5500001
 
 

{flru_parser-0.3.1 → flru_parser-0.3.2}/tests/test_freelancers.py

@@ -4,7 +4,7 @@ from flru.parsers import parse_freelancer_list
 
 
 def test_freelancer_list() -> None:
-    html = (Path(__file__).parent / "fixtures" / "freelancers.html").read_text()
+    html = (Path(__file__).parent / "fixtures" / "freelancers.html").read_text(encoding="utf-8")
     page = parse_freelancer_list(html, "https://www.fl.ru/freelancers/")
     assert len(page.items) == 1
     assert page.has_next is True

{flru_parser-0.3.1 → flru_parser-0.3.2}/tests/test_parsers.py

@@ -35,6 +35,38 @@ def test_project_list() -> None:
     assert second.budget.amount_max == Decimal("180000")
 
 
+def test_current_catalog_card_and_path_pagination() -> None:
+    html = """
+    <html><body><main>
+      <div class="b-page__lenta">
+        <div class="pt-24 b-page__lenta_item b-post" data-id="qa-lenta-1">
+          <div class="b-post__grid">
+            <h2 class="text-h5 b-post__title b-post__grid_title">
+              <a href="/projects/5515261/video.html">Заменить лицо и голос на видео</a>
+            </h2>
+            <div class="b-post__price b-post__grid_price">от 30 000 ₽</div>
+            <div class="b-post__txt text-5">Полное описание актуальной карточки заказа.</div>
+          </div>
+          <div class="b-post__foot">Заказ 1 час назад 7 ответов</div>
+        </div>
+      </div>
+      <a href="/projects/page-2/">Следующая →</a>
+    </main></body></html>
+    """
+
+    page = parse_project_list(html, "https://www.fl.ru/projects/", page=1)
+
+    assert len(page.items) == 1
+    assert page.next_url == "https://www.fl.ru/projects/page-2/"
+    assert page.has_next is True
+    project = page.items[0]
+    assert project.kind is ProjectKind.ORDER
+    assert project.description == "Полное описание актуальной карточки заказа."
+    assert project.budget is not None
+    assert project.budget.amount_min == Decimal("30000")
+    assert project.budget.currency == "RUB"
+
+
 def test_project_detail() -> None:
     project = parse_project_detail(
         read("project.html"),

{flru_parser-0.3.1 → flru_parser-0.3.2}/tests/test_resilience.py

@@ -89,5 +89,5 @@ async def test_proxy_snapshot_redacts_credentials() -> None:
 
     snapshot = await pool.snapshot()
 
-    assert snapshot[0].url == "http://user:***@proxy.example:8080"
+    assert snapshot[0].url == "http://***@proxy.example:8080"
     assert "password" not in (snapshot[0].url or "")

{flru_parser-0.3.1 → flru_parser-0.3.2}/tests/test_security_transport.py

@@ -21,7 +21,7 @@ def config(**kwargs):
 
 
 def test_url_security_and_redaction() -> None:
-    assert redact_url("http://user:pass@proxy.local:8080/x?token=abc") == "http://user:***@proxy.local:8080/x?token=***"
+    assert redact_url("http://user:pass@proxy.local:8080/x?token=abc") == "http://***@proxy.local:8080/x?token=***"
     assert validate_url("https://st.fl.ru/x", frozenset({"fl.ru"}), True).endswith("/x")
     with pytest.raises(SecurityError):
         validate_url("ftp://www.fl.ru/x", frozenset({"fl.ru"}), True)