Skip to content

Commit 4ac0977

Browse files
Merge pull request #226 from datakind/develop
Merge develop into staging
2 parents 8eba633 + 482c2eb commit 4ac0977

18 files changed

Lines changed: 1376 additions & 421 deletions

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ dependencies = [
2626
"pandas~=2.0",
2727
"six~=1.16.0",
2828
"thefuzz[speedup]~=0.22.1",
29-
"databricks-sql-connector~=3.5.0",
29+
"databricks-sql-connector[pyarrow]~=4.2.0",
3030
"pandera~=0.13",
3131
"mlflow~=2.22",
3232
"cachetools",
3333
"types-cachetools",
34-
"edvise~=0.1.12",
34+
"edvise~=0.2.0",
3535
]
3636

3737
[project.urls]

src/webapp/database.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ class InstTable(Base):
218218
edvise_id: Mapped[str | None] = mapped_column(
219219
String(VAR_CHAR_LENGTH), nullable=True
220220
)
221+
# Only populated for Legacy schools (any-format uploads).
222+
legacy_id: Mapped[str | None] = mapped_column(
223+
String(VAR_CHAR_LENGTH), nullable=True
224+
)
221225
created_at: Mapped[datetime.datetime] = mapped_column(
222226
DateTime(timezone=True),
223227
server_default=func.now(),

src/webapp/fixtures/validation_error_snapshots/mixed_types_multiple_columns.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ Column 'Score' has validation errors:
88
• Row 3: Validation failed for greater_than(0) check. Current value: found '-5'
99

1010
Column 'Student ID' has validation errors:
11-
• Row 1: Value must be at least 3 characters long. Current value: found '****' (value masked for privacy)
11+
• Row 1: Value must be at least 3 characters long. Current value: found 'AB'

src/webapp/gcsutil.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,8 @@ def validate_file(
377377
allowed_schemas: List of schema/model names allowed.
378378
base_schema: Base schema dict.
379379
inst_schema: Optional extension schema with institutions.* blocks.
380-
institution_id: Key into inst_schema["institutions"]: "edvise", "pdp", or
381-
institution UUID for custom. Default "pdp" for backward compatibility.
380+
institution_id: Key into inst_schema["institutions"]: "edvise", "pdp",
381+
"legacy" (any-format uploads), or institution UUID for custom. Default "pdp".
382382
institution_identifier: Optional institution ID (e.g. UUID). Reserved for
383383
future use; Edvise uses JSON-based validation only (different shape).
384384

0 commit comments

Comments
 (0)