icpc-api 0.1.0__tar.gz → 0.2.0__tar.gz

{icpc_api-0.1.0/icpc_api.egg-info → icpc_api-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icpc-api
-Version: 0.1.0
+Version: 0.2.0
 Summary: Unofficial Python client and CLI for the icpc.global API
 Author-email: Nikita Sychev <root@nsychev.ru>
 License-Expression: MIT

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/__init__.py

@@ -14,7 +14,7 @@ from icpc.errors import ApiError, AuthError, IcpcError, SearchError
 from icpc.facade.client import AsyncIcpc, Icpc, Include
 from icpc.facade.domain import ContestView, Member, Team
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 __all__ = [
     "ApiError",

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/api/__init__.py

@@ -13,6 +13,6 @@ Not all endpoints are wrapped here. Please fill an issue for missing ones or use
 `icpc raw`.
 """
 
-from icpc.api import common, contest, person, public, staff, team
+from icpc.api import common, contest, person, public, staff, survey, team
 
-__all__ = ["common", "contest", "person", "public", "staff", "team"]
+__all__ = ["common", "contest", "person", "public", "staff", "survey", "team"]

icpc_api-0.2.0/icpc/api/survey.py

@@ -0,0 +1,31 @@
+"""``/contest/survey`` endpoints."""
+
+from __future__ import annotations
+
+from icpc.models.surveys import Survey, SurveyField
+from icpc.transport.operation import Operation, Request, list_op, model_op
+
+__all__ = ["fields", "for_contest", "get"]
+
+
+def for_contest(contest_id: int) -> Operation[list[Survey]]:
+    """Every survey of a contest."""
+    return list_op(Request("GET", f"/contest/survey/{contest_id}/table"), Survey)
+
+
+def get(survey_id: int) -> Operation[Survey]:
+    """One survey, by its own id rather than its contest's.
+
+    Note that this endpoint and :func:`for_contest` return different subset
+    of fields about the model.
+    """
+    return model_op(Request("GET", f"/contest/survey/{survey_id}"), Survey)
+
+
+def fields(survey_id: int) -> Operation[list[SurveyField]]:
+    """A survey's fields, in ``fieldOrder``.
+
+    ``DESCRIPTION`` entries are not questions but just text labels; see
+    :attr:`~icpc.models.surveys.SurveyField.is_question`.
+    """
+    return list_op(Request("GET", f"/contest/survey/field/{survey_id}/table"), SurveyField)

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/cli/columns.py

@@ -87,6 +87,7 @@ def _member(member: Member) -> dict[str, Any]:
         row["completeRegistration"] = member.registration_complete
     row["participant"] = _dump(member.participant)
     row["extras"] = member.extras
+    row["survey"] = member.survey
     return row
 
 
@@ -239,6 +240,7 @@ def _member_shape() -> Fields:
         **_from_model(TeamMemberRow),
         "participant": _from_model(ContestParticipantRow),
         "extras": Open,
+        "survey": Open,
     }
 
 
@@ -321,6 +323,7 @@ _NEEDS = {
     "participant": "participants",
     "contest": "metadata",
     "siteId": "metadata",
+    "survey": "surveys",
 }
 
 

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/cli/main.py

@@ -21,6 +21,7 @@ from icpc.api import contest as contest_api
 from icpc.api import person as person_api
 from icpc.api import public as public_api
 from icpc.api import staff as staff_api
+from icpc.api import survey as survey_api
 from icpc.api import team as team_api
 from icpc.api.person import ReferenceRole
 from icpc.api.team import NewTeam, NewTeamMember
@@ -45,6 +46,7 @@ from icpc.models.enums import ExportType, MemberRole, TeamStatus
 from icpc.search import _generated as endpoints
 from icpc.search.dsl import Filter, SortKey
 from icpc.search.endpoint import SearchEndpoint
+from icpc.search.surveys import survey_responses
 from icpc.transport.operation import Request, json_op
 
 app = typer.Typer(no_args_is_help=True, help=__doc__, add_completion=True)
@@ -54,12 +56,14 @@ team_app = typer.Typer(no_args_is_help=True, help="Read and modify teams.")
 public_app = typer.Typer(no_args_is_help=True, help="Public endpoints; no login needed.")
 person_app = typer.Typer(no_args_is_help=True, help="Look people up.")
 staff_app = typer.Typer(no_args_is_help=True, help="Contest staff.")
+survey_app = typer.Typer(no_args_is_help=True, help="Contest surveys and their answers.")
 app.add_typer(auth_app, name="auth")
 app.add_typer(contest_app, name="contest")
 app.add_typer(team_app, name="team")
 app.add_typer(public_app, name="public")
 app.add_typer(person_app, name="person")
 app.add_typer(staff_app, name="staff")
+app.add_typer(survey_app, name="survey")
 
 
 @dataclass
@@ -404,6 +408,64 @@ def staff_remove(ctx: typer.Context, staff_member_id: int) -> None:
     note(f"staff member {staff_member_id} removed")
 
 
+# ------------------------------------------------------------------ survey --
+
+
+@survey_app.command("list")
+def survey_list(ctx: typer.Context, contest_id: int) -> None:
+    """Surveys of a contest.
+
+    Most contests have none. `visibility` says who the survey was put to, but
+    the answers come back per person either way.
+    """
+    with _client(ctx) as icpc:
+        rows = icpc.send(survey_api.for_contest(contest_id))
+    if not rows:
+        warn(f"contest {contest_id} has no surveys")
+    render(
+        rows,
+        _ctx(ctx).output,
+        columns=["id", "name", "visibility", "responses", "acceptsResponses", "surveyEndDate"],
+    )
+
+
+@survey_app.command("fields")
+def survey_fields(ctx: typer.Context, survey_id: int) -> None:
+    """Questions of a survey, in display order.
+
+    This is the lookup that decodes an answer: responses and `contest load`
+    columns are keyed by the `id` shown here. A `DESCRIPTION` row is static text
+    rather than a question, so it never carries an answer.
+    """
+    with _client(ctx) as icpc:
+        rows = icpc.send(survey_api.fields(survey_id))
+    render(rows, _ctx(ctx).output, columns=["id", "type", "name", "hint", "defaultValue"])
+
+
+@survey_app.command("responses")
+def survey_responses_cmd(ctx: typer.Context, survey_id: int) -> None:
+    """Answers to a survey, one row per person who replied.
+
+    Answer columns are named by field id — `icpc survey fields` maps them back to
+    the questions. The server ignores `filter:` here, so narrowing is a job for
+    the shell.
+
+        icpc -o csv survey responses 894
+    """
+    endpoint = survey_responses(survey_id)
+    with _client(ctx) as icpc:
+        rows = icpc.all(endpoint)
+    if not rows:
+        warn(f"survey {survey_id} has no responses")
+    columns = list(endpoint.all_fields)
+    seen: list[str] = []
+    for row in rows:
+        for key in row.answers:
+            if key not in seen:
+                seen.append(key)
+    render(rows, _ctx(ctx).output, columns=columns + sorted(seen, key=int))
+
+
 # ----------------------------------------------------------------- contest --
 
 

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/facade/client.py

@@ -17,6 +17,7 @@ from typing import Any, Self
 from icpc import errors
 from icpc.api import contest as contest_api
 from icpc.api import person as person_api
+from icpc.api import survey as survey_api
 from icpc.api import team as team_api
 from icpc.api.person import ReferenceRole
 from icpc.auth.flows import AsyncCognitoAuth, CognitoAuth, StaticTokenAuth, SyncStaticTokenAuth
@@ -25,9 +26,11 @@ from icpc.auth.tokens import TokenSet
 from icpc.config import DEFAULT_PAGE_SIZE, Settings
 from icpc.facade.domain import ContestView, join
 from icpc.models.entities import ContestReference, PersonBasic, Team
+from icpc.models.surveys import SurveyResponseRow
 from icpc.search import _generated as endpoints
 from icpc.search.dsl import Q
 from icpc.search.endpoint import SearchEndpoint
+from icpc.search.surveys import survey_responses
 from icpc.transport.async_client import AsyncTransport
 from icpc.transport.operation import Operation
 from icpc.transport.sync_client import Transport
@@ -80,10 +83,12 @@ class Include(Flag):
     INSTITUTIONS = auto()
     PARTICIPANTS = auto()
     METADATA = auto()
+    #: Every survey of the contest, and every response to each.
+    SURVEYS = auto()
 
     #: Teams, rosters, institutions and contest metadata — not the participant table.
     DEFAULT = TEAMS | MEMBERS | INSTITUTIONS | METADATA
-    ALL = TEAMS | MEMBERS | INSTITUTIONS | PARTICIPANTS | METADATA
+    ALL = TEAMS | MEMBERS | INSTITUTIONS | PARTICIPANTS | METADATA | SURVEYS
 
     @classmethod
     def named(cls, names: Iterable[str]) -> Include:
@@ -308,6 +313,19 @@ class AsyncIcpc:
     async def _all_columns[R, F](self, endpoint: SearchEndpoint[R, F]) -> list[R]:
         return await self.all(endpoint, _full(endpoint))
 
+    async def _survey_rows(self, contest_id: int) -> list[SurveyResponseRow]:
+        """Every response to every survey of a contest, in one flat list.
+
+        Two stages, because responses are keyed by survey rather than by
+        contest: list the surveys, then fetch each one's rows.
+        """
+        surveys = await self.send(survey_api.for_contest(contest_id))
+        ids = [s.id for s in surveys if s.id is not None]
+        if not ids:
+            return []
+        fetched = await asyncio.gather(*(self.all(survey_responses(i)) for i in ids))
+        return [row for rows in fetched for row in rows]
+
     # ------------------------------------------------------ joined contest --
 
     async def load_contest(
@@ -345,6 +363,11 @@ class AsyncIcpc:
                 if Include.PARTICIPANTS in include
                 else None
             )
+            surveys = (
+                group.create_task(self._survey_rows(contest_id))
+                if Include.SURVEYS in include
+                else None
+            )
 
         return join(
             teams.result(),
@@ -353,6 +376,7 @@ class AsyncIcpc:
             members=members.result() if members else (),
             institutions=institutions.result() if institutions else (),
             participants=participants.result() if participants else (),
+            survey_responses=surveys.result() if surveys else (),
         )
 
     # -------------------------------------------------------------- writes --
@@ -546,6 +570,17 @@ class Icpc:
     def _all_columns[R, F](self, endpoint: SearchEndpoint[R, F]) -> list[R]:
         return self.all(endpoint, _full(endpoint))
 
+    def _survey_rows(self, contest_id: int) -> list[SurveyResponseRow]:
+        """Every response to every survey of a contest — see
+        :meth:`AsyncIcpc._survey_rows`, of which this is the sequential twin.
+        """
+        surveys = self.send(survey_api.for_contest(contest_id))
+        rows: list[SurveyResponseRow] = []
+        for one in surveys:
+            if one.id is not None:
+                rows.extend(self.all(survey_responses(one.id)))
+        return rows
+
     # ------------------------------------------------------ joined contest --
 
     def load_contest(self, contest_id: int, include: Include = Include.DEFAULT) -> ContestView:
@@ -572,6 +607,7 @@ class Icpc:
             if Include.PARTICIPANTS in include
             else []
         )
+        surveys = self._survey_rows(contest_id) if Include.SURVEYS in include else []
         return join(
             teams,
             contest=metadata,
@@ -579,6 +615,7 @@ class Icpc:
             members=members,
             institutions=institutions,
             participants=participants,
+            survey_responses=surveys,
         )
 
     # -------------------------------------------------------------- writes --

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/facade/domain.py

@@ -30,6 +30,7 @@ from icpc.models.blobs import TeamMemberBlob
 from icpc.models.common import NamedRef
 from icpc.models.entities import Contest
 from icpc.models.enums import TeamStatus, coach_roles, contestant_roles
+from icpc.models.surveys import SurveyResponseRow, merge_answers
 
 __all__ = ["ContestView", "Member", "Team", "join"]
 
@@ -50,6 +51,10 @@ class Member(TeamMemberRow):
     registration_complete: bool | None = None
     #: The person's contest-wide record, when the participant table was fetched.
     participant: ContestParticipantRow | None = None
+    #: Survey answers for this person, keyed by survey field id, merged across
+    #: every survey fetched. Empty unless the surveys were asked for, and empty
+    #: for anyone who did not answer.
+    survey: dict[str, str] = Field(default_factory=dict)
 
 
 class Team(TeamRow):
@@ -137,6 +142,7 @@ def _member_from_row(row: TeamMemberRow) -> Member:
         **_columns(row),
         registration_complete=row.complete_registration,
         participant=None,
+        survey={},
     )
 
 
@@ -147,6 +153,7 @@ def _member_from_blob(blob: TeamMemberBlob) -> Member:
         role=blob.role,
         registration_complete=blob.reg_complete,
         participant=None,
+        survey={},
     )
 
 
@@ -158,14 +165,18 @@ def join(
     members: Iterable[TeamMemberRow] = (),
     institutions: Iterable[InstitutionRow] = (),
     participants: Iterable[ContestParticipantRow] = (),
+    survey_responses: Iterable[SurveyResponseRow] = (),
 ) -> ContestView:
     """Build a :class:`ContestView` from raw search rows.
 
     When ``members`` is empty the roster falls back to each team row's embedded
     ``teamMembers`` blob, which is thinner but costs no extra request.
+
+    ``survey_responses`` may hold the rows of several surveys at once.
     """
     by_inst = {row.inst_id: row for row in institutions if row.inst_id is not None}
     by_person = {row.person_id: row for row in participants if row.person_id is not None}
+    answers = merge_answers(survey_responses)
 
     rosters: dict[int, list[Member]] = {}
     for row in members:
@@ -181,6 +192,7 @@ def join(
         for member in roster:
             if member.person_id is not None:
                 member.participant = by_person.get(member.person_id)
+                member.survey = answers.get(member.person_id, {})
         built.append(
             Team.model_construct(
                 **_columns(row),

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/models/__init__.py

@@ -24,10 +24,13 @@ from icpc.models.enums import (
     ExportType,
     MemberRole,
     ParticipantRole,
+    SurveyFieldType,
+    SurveyVisibility,
     TeamStatus,
     coach_roles,
     contestant_roles,
 )
+from icpc.models.surveys import Survey, SurveyField, SurveyResponseRow
 
 __all__ = [
     "CertificateRow",
@@ -45,6 +48,11 @@ __all__ = [
     "StaffRow",
     "StaffTshirtRow",
     "StandingsRow",
+    "Survey",
+    "SurveyField",
+    "SurveyFieldType",
+    "SurveyResponseRow",
+    "SurveyVisibility",
     "TeamMemberBlob",
     "TeamMemberRow",
     "TeamRow",

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/models/_generated.py

@@ -71,7 +71,7 @@ class CertificateRow(HasTeamMembers, Row):
     team_name: str | None = _Field(default=None, description="Team Name")
     team_id: int | None = None
     team_members: str | None = None
-    lite_team_member_set: str | None = None
+    lite_team_member_set: list | None = None
 
 
 class ContestParticipantRow(Row):
@@ -408,7 +408,7 @@ class TeamMemberRow(HasExtraFields, Row):
     certificate_name: str | None = _Field(default=None, description="Certificate Name")
     team_id: int | None = _Field(default=None, description="Team ID")
     team_name: str | None = _Field(default=None, description="Team Name")
-    workstation_id: int | None = _Field(default=None, description="Workstation Id")
+    workstation_id: str | None = _Field(default=None, description="Workstation Id")
     team_status: TeamStatus | str | None = _Field(
         default=None, union_mode="left_to_right", description="Team Status"
     )
@@ -442,7 +442,7 @@ class TeamRow(HasTeamMembers, HasExtraFields, Row):
     paid: bool | None = _Field(default=None, description="Paid")
     note: str | None = _Field(default=None, description="Note")
     check_in: str | None = _Field(default=None, description="Check-In")
-    workstation_id: int | None = _Field(default=None, description="Workstation Id")
+    workstation_id: str | None = _Field(default=None, description="Workstation Id")
     rank: int | None = _Field(default=None, description="Rank")
     certified: bool | None = _Field(default=None, description="Certified")
     eligibility_status: EligibilityStatus | str | None = _Field(

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/models/blobs.py

@@ -3,8 +3,7 @@
 Two search columns carry JSON encoded *as a string* rather than as nested JSON:
 
 * ``teamMembers`` on a team row — the roster, so a team listing needs no second call.
-* ``extraField`` / ``genericField`` — the answers to a contest's custom registration
-  questions, which differ per contest.
+* ``extraField`` — the answers to a contest's extra registration fields
 
 Both are parsed here into real objects, and always tolerantly: a malformed blob
 yields an empty result rather than failing the whole page.

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/models/enums.py

@@ -19,6 +19,8 @@ __all__ = [
     "PublicPagesVisibility",
     "Sex",
     "ShirtSize",
+    "SurveyFieldType",
+    "SurveyVisibility",
     "TeamStatus",
     "Title",
     "coach_roles",
@@ -120,6 +122,38 @@ class PublicPagesVisibility(StrEnum):
     WITHOUT_PEOPLE = "WITHOUT_PEOPLE"
 
 
+class SurveyVisibility(StrEnum):
+    """Who a survey is shown to.
+
+    Complete, from ``…contest.businessobjects.survey.Survey``.
+
+    ``TEAMSACCPTED`` is the server-side typo.
+    """
+
+    ALL = "ALL"
+    STAFF = "STAFF"
+    TEAMSACCPTED = "TEAMSACCPTED"
+    TEAMS = "TEAMS"
+
+
+class SurveyFieldType(StrEnum):
+    """What one survey field asks for.
+
+    Complete, from ``…contest.businessobjects.survey.SurveyField``; the six match
+    the constants in the frontend's survey renderer.
+
+    ``DESCRIPTION`` is static text rather than a question, and never carries an
+    answer.
+    """
+
+    DESCRIPTION = "DESCRIPTION"
+    SHORT_ANSWER = "SHORT_ANSWER"
+    LONG_ANSWER = "LONG_ANSWER"
+    DROPDOWN = "DROPDOWN"
+    CHECKBOXES = "CHECKBOXES"
+    USERSLIST = "USERSLIST"
+
+
 class Title(StrEnum):
     """Complete, from ``…person.businessobjects.PersonInfoAbstract``."""
 

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/models/mixins.py

@@ -36,9 +36,5 @@ class HasExtraFields:
 
     @property
     def extras(self) -> dict[str, str]:
-        """Answers to the contest's custom registration questions.
-
-        Keys are the contest's own question labels, so they differ between
-        contests and are frequently not in English.
-        """
+        """Answers to the contest's extra registration fields."""
         return parse_extra_fields(self.extra_field)

icpc_api-0.2.0/icpc/models/surveys.py

@@ -0,0 +1,164 @@
+"""Survey definition.
+
+A survey is a form linked to the contest. *Fields* define the questions.
+Respondents are defined by :class:`~icpc.models.enums.SurveyVisibility`.
+Each eligible person submit their own response.
+
+A response row carries the person's identity in named columns and their answers
+keyed by :attr:`SurveyField.id` as a string, so the answers arrive in
+``model_extra`` rather than as declared fields. Read them off
+:attr:`SurveyResponseRow.answers`.
+
+Answers are always strings on the wire, whatever the field type: a
+``CHECKBOXES`` multi-selection arrives as one joined string rather than a list.
+Nothing here parses them further, because the separator is not consistent — see
+:attr:`SurveyField.options`.
+"""
+
+from __future__ import annotations
+
+import json
+from collections.abc import Iterable
+from datetime import date
+
+from pydantic import Field
+
+from icpc.models.base import Row
+from icpc.models.enums import SurveyFieldType, SurveyVisibility
+
+__all__ = ["Survey", "SurveyField", "SurveyResponseRow", "merge_answers"]
+
+
+class Survey(Row):
+    """One survey. ``GET /contest/survey/{contest_id}/table`` lists a contest's."""
+
+    id: int | None = None
+    #: Required server-side, 3 to 128 characters.
+    name: str | None = None
+    #: Up to 65536 characters.
+    description: str | None = None
+    #: Required server-side.
+    visibility: SurveyVisibility | str | None = Field(default=None, union_mode="left_to_right")
+    accepts_responses: bool | None = None
+    survey_end_date: date | None = None
+    #: How many people have answered — a count, not the responses themselves.
+    responses: int | None = None
+    #: Present on ``GET /contest/survey/{survey_id}``, absent from the list rows.
+    contest_id: int | None = None
+
+
+class SurveyField(Row):
+    """One question. ``GET /contest/survey/field/{survey_id}/table``.
+
+    ``next`` and ``prev`` chain the fields in display order, alongside
+    :attr:`field_order`.
+    """
+
+    id: int | None = None
+    #: Required server-side, 3 to 255 characters.
+    name: str | None = None
+    #: Up to 128 characters.
+    hint: str | None = None
+    #: Overloaded: prose for a ``DESCRIPTION``, the option list for a
+    #: ``DROPDOWN`` or ``CHECKBOXES``. Up to 65536 characters. See :attr:`options`.
+    default_value: str | None = None
+    #: Required server-side.
+    type: SurveyFieldType | str | None = Field(default=None, union_mode="left_to_right")
+    field_order: int | None = None
+    #: The ``name`` — not the id — of the field this one's display depends on.
+    dependency_field_name: str | None = None
+    #: Comma-separated values of ``dependency_field_name`` that reveal this field.
+    #: When the dependency is a ``CHECKBOXES``, any overlap counts, not equality.
+    dependency_field_value: str | None = None
+    image: str | None = None
+    next: int | None = None
+    prev: int | None = None
+
+    @property
+    def is_question(self) -> bool:
+        """Whether this field can hold an answer.
+
+        ``DESCRIPTION`` fields are static text the form displays, so they are
+        never answered and are not worth offering as a column.
+        """
+        return self.type != SurveyFieldType.DESCRIPTION
+
+    @property
+    def options(self) -> list[str]:
+        """The choices of a ``DROPDOWN`` or ``CHECKBOXES``, decoded as the UI does.
+
+        The frontend reads :attr:`default_value` as a JSON array of objects
+        carrying a ``name``, and falls back to splitting on commas. That fallback
+        is reproduced here rather than improved on: a survey storing its options
+        semicolon-separated reads back as one option, and that is what the form
+        itself shows.
+
+        Empty for every other field type, where ``default_value`` is prose or a
+        prefilled answer rather than a list of choices.
+        """
+        if self.type not in (SurveyFieldType.DROPDOWN, SurveyFieldType.CHECKBOXES):
+            return []
+        if not self.default_value:
+            return []
+        try:
+            parsed = json.loads(self.default_value)
+        except ValueError:
+            parsed = None
+        if isinstance(parsed, list) and all(
+            isinstance(item, dict) and "name" in item for item in parsed
+        ):
+            return [str(item["name"]) for item in parsed]
+        return [part for part in self.default_value.split(",") if part.strip()]
+
+
+class SurveyResponseRow(Row):
+    """One person's answers. ``GET /contest/survey/responses/{survey_id}/table``.
+
+    Every column here is the wire's own, and every one but :attr:`user_id` is a
+    string — including ``workstations`` and the two institution columns, which
+    arrive bracket-wrapped (``"[SPb ITMO]"``) rather than as arrays.
+    """
+
+    #: The person id, matching ``personId`` on a team member. Arrives as a string.
+    user_id: int | None = None
+    username: str | None = None
+    first_name: str | None = None
+    last_name: str | None = None
+    badge_name: str | None = None
+    #: Not a :class:`~icpc.models.enums.Sex`: contests serve values such as
+    #: ``"Default sex"`` here, so this stays free text.
+    sex: str | None = None
+    teams: str | None = None
+    participation: str | None = None
+    workstations: str | None = None
+    institution_long_names: str | None = None
+    institution_short_names: str | None = None
+
+    @property
+    def answers(self) -> dict[str, str]:
+        """Answers by :attr:`SurveyField.id`, as a string key.
+
+        The named columns above are the person, not the questionnaire; only the
+        numerically-keyed extras are answers. Unanswered fields are dropped,
+        which covers both the ``null`` and the empty-string forms the server
+        uses inconsistently.
+        """
+        found: dict[str, str] = {}
+        for key, value in (self.model_extra or {}).items():
+            if key.isdigit() and value not in (None, ""):
+                found[key] = str(value)
+        return found
+
+
+def merge_answers(rows: Iterable[SurveyResponseRow]) -> dict[int, dict[str, str]]:
+    """Answers by person id, merged across however many surveys.
+
+    Field ids are unique across a contest's surveys, so several surveys collapse
+    into one mapping without colliding.
+    """
+    merged: dict[int, dict[str, str]] = {}
+    for row in rows:
+        if row.user_id is None:
+            continue
+        merged.setdefault(row.user_id, {}).update(row.answers)
+    return merged

{icpc_api-0.1.0 → icpc_api-0.2.0}/icpc/search/__init__.py

@@ -46,6 +46,7 @@ from icpc.search._generated import (
 from icpc.search.dsl import Direction, Filter, FilterMode, Q, SortKey
 from icpc.search.endpoint import SearchEndpoint
 from icpc.search.fields import Field
+from icpc.search.surveys import SurveyResponseFields, survey_responses
 
 __all__ = [
     "CertificateFields",
@@ -64,6 +65,7 @@ __all__ = [
     "StaffMemberFields",
     "StaffTshirtFields",
     "StandingsFields",
+    "SurveyResponseFields",
     "TeamFields",
     "TeamMemberFields",
     "TeamSummaryFields",
@@ -96,4 +98,5 @@ __all__ = [
     "site_team_certificates",
     "site_team_members",
     "site_teams",
+    "survey_responses",
 ]