diff --git a/app/services/council.py b/app/services/council.py index 3664692..27fda30 100644 --- a/app/services/council.py +++ b/app/services/council.py @@ -17,7 +17,7 @@ from app.models import Employee, CouncilCorrections from app.services.academic_degrees import academic_degrees from app.services.council_source import _doi, _journal_names, _name, load_reference, _description_journals from app.services.council_catalog import catalog, publication_catalog -from app.services.publication_quartiles import labels as quartile_labels, identity_issues, hse_entries, merge as merge_quartiles +from app.services.publication_quartiles import qualifying_entries, identity_issues, hse_entries, merge as merge_quartiles from app.services.council_assessment import ( BRANCHES, assess_candidate, degree_level, evidence, publication_proofs, publication_type_allowed, sourced, @@ -120,10 +120,12 @@ def _database_article(publication) -> dict: if isinstance(imported, dict) and not imported_issues and (not imported_doi or imported_doi == doi): journals.extend(_journal_names(imported)) issues = list(dict.fromkeys([*issues, *imported_issues])) + quartile_entries = [*qualifying_entries(publication.quartiles, publication.year, doi, current_journals, identifiers), + *qualifying_entries(imported_quartiles, publication.year, doi, current_journals, identifiers)] return {"title": publication.title, "year": publication.year, "doi": _doi(publication.doi_url or ""), "types": [TYPES.get(kind.upper(), f"Другой тип: {kind}")] if kind else [], - "quartiles": list(dict.fromkeys([*quartile_labels(publication.quartiles, publication.year, doi, current_journals, identifiers), - *quartile_labels(imported_quartiles, publication.year, doi, current_journals, identifiers)])), + "quartiles": list(dict.fromkeys(f"{item['system']} {item['quartile']}" for item in quartile_entries)), + "quartile_entries": quartile_entries, "quartile_issues": issues, "journals": journals, "issns": [raw[key] for key in ("issn", "eissn", "ISSN", "EISSN") if isinstance(raw.get(key), str)], "source_hashes": [publication.source_hash], @@ -192,14 +194,18 @@ def _unique_articles(articles: list[dict], start: date, end: date, corrections=N year = article["year"] = years[0] if len(years) == 1 else None article["source_years"] = years article["automatic_quartile_bases"] = [] - if len(article["journals"]) == 1 and not article["quartile_issues"]: + if len(article["journals"]) == 1 and not article["quartile_issues"] and not article["journal_corrected"]: for item in evidence: if item["year"] != year: continue - for label in item["quartiles"]: - if label.endswith((" Q1", " Q2")): - article["automatic_quartile_bases"].append({"basis": label[-2:], "system": label[:-3], - "applicable_year": year, "source": " / ".join(item["origins"]), "source_url": item.get("url")}) + details = item.get("quartile_entries") + if details is None: + # Prepared CSV evidence has no category or metric metadata. + details = [{"quartile": label[-2:], "system": label[:-3], + "source": " / ".join(item["origins"]), "source_url": item.get("url")} + for label in item["quartiles"] if label.endswith((" Q1", " Q2"))] + article["automatic_quartile_bases"].extend( + {**entry, "basis": entry["quartile"], "applicable_year": year} for entry in details) article["criteria"] = [*article["quartiles"], *article["quartile_issues"]] matches = list(dict.fromkeys(k1_journals[key] for name in article["journals"] if (key := _journal_key(name)) in k1_journals)) diff --git a/app/services/council_assessment.py b/app/services/council_assessment.py index ade3fa4..61c5078 100644 --- a/app/services/council_assessment.py +++ b/app/services/council_assessment.py @@ -183,7 +183,7 @@ def assess_article(article, proofs, start, end, level, branch, specialty, policy basis_conflict = False for basis in bases: key = ("ВАК", basis_year) if basis["basis"] in {"К1", "К2"} else ( - basis.get("system", basis["basis"]), basis.get("category"), basis.get("metric_year"), basis_year) + basis.get("system", basis["basis"]), basis.get("category"), basis.get("metric"), basis.get("metric_year"), basis_year) if key in claims and claims[key] != basis["basis"]: reasons.append("Подтверждённые основания источников расходятся") basis_conflict = True diff --git a/app/services/publication_quartiles.py b/app/services/publication_quartiles.py index c547d0e..f9bdbd4 100644 --- a/app/services/publication_quartiles.py +++ b/app/services/publication_quartiles.py @@ -129,13 +129,18 @@ def identity_issues(payload, doi="", journals=(), identifiers=()): if (issue := binding_issue(item, payload, doi, journals, identifiers)))) +def qualifying_entries(payload, publication_year, doi="", journals=(), identifiers=()): + return [item for item in entries(payload) + if item["quartile"] in {"Q1", "Q2"} + and item["system"] in SYSTEM_FIELDS + and item.get("publication_year") == publication_year + and item.get("metric_year") in {None, publication_year} + and not binding_issue(item, payload, doi, journals, identifiers)] + + def labels(payload, publication_year, doi="", journals=(), identifiers=()): - return list(dict.fromkeys(f"{item['system']} {item['quartile']}" for item in entries(payload) - if item["quartile"] in {"Q1", "Q2"} - and item["system"] in SYSTEM_FIELDS - and item.get("publication_year") == publication_year - and item.get("metric_year") in {None, publication_year} - and not binding_issue(item, payload, doi, journals, identifiers))) + return list(dict.fromkeys(f"{item['system']} {item['quartile']}" for item in + qualifying_entries(payload, publication_year, doi, journals, identifiers))) def index_sjr(rankings): diff --git a/app/version.py b/app/version.py index 6a17eff..02147c1 100644 --- a/app/version.py +++ b/app/version.py @@ -1,3 +1,3 @@ -APP_VERSION = "1.0.0" -FRONTEND_VERSION = "1.0.0" -BACKEND_VERSION = "1.0.0" +APP_VERSION = "1.0.1" +FRONTEND_VERSION = "1.0.1" +BACKEND_VERSION = "1.0.1" diff --git a/pyproject.toml b/pyproject.toml index e089cea..ef316f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "miem-workers" -version = "1.0.0" +version = "1.0.1" description = "MIEM employees parser, admin API, and web admin" requires-python = ">=3.11" dependencies = [ diff --git a/tests/test_api.py b/tests/test_api.py index 92e1b7f..707c8f7 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -18,7 +18,7 @@ def test_health_returns_versions(): response = TestClient(app).get("/api/health") assert response.status_code == 200 - assert response.json()["backend_version"] == "1.0.0" + assert response.json()["backend_version"] == "1.0.1" def test_api_employees_and_stats_require_admin_session(): diff --git a/tests/test_council.py b/tests/test_council.py index 9212b64..f7b26bc 100644 --- a/tests/test_council.py +++ b/tests/test_council.py @@ -219,7 +219,7 @@ def test_public_page_data_minimization_and_safe_links(db_session, export): assert "<script>" in response.text and "