Skip to content

fix: accept GeoJSON strings for Edm.GeographyPoint in AzureSearchWriter#2556

Open
chon3806 wants to merge 3 commits intomicrosoft:masterfrom
chon3806:fix/azure-search-geographypoint-string
Open

fix: accept GeoJSON strings for Edm.GeographyPoint in AzureSearchWriter#2556
chon3806 wants to merge 3 commits intomicrosoft:masterfrom
chon3806:fix/azure-search-geographypoint-string

Conversation

@chon3806
Copy link
Copy Markdown

@chon3806 chon3806 commented Apr 25, 2026

Summary

Fixes #2420.

AzureSearchWriter failed with 400 Bad Request when a user provided an Edm.GeographyPoint value as a StringType column containing GeoJSON. The string was JSON-escaped during serialization, so Azure AI Search received a quoted string instead of a spatial object:

"location":"{\"type\":\"Point\",\"coordinates\":[...]}"   // rejected
"location":{"type":"Point","coordinates":[...]}           // expected

Fix

Added convertGeographyPointToStruct in AzureSearch.scala, mirroring the existing convertDateTimeToISO8601 handling. For every top-level index field declared as Edm.GeographyPoint, if the corresponding DataFrame column is a StringType, it is parsed via from_json (with mode = FAILFAST) into the canonical struct<type: string, coordinates: array<double>> before checkSchemaParity and to_json. Struct-based inputs continue to work unchanged.

FAILFAST was chosen so malformed GeoJSON surfaces as a loud SparkException at row materialization rather than silently nulling out the field (the default PERMISSIVE behavior of from_json). This is consistent with AzureSearchWriter.write defaulting to fatalErrors = true.

Tests

Added in SearchWriterSuitePart2.scala:

  • End-to-end (live Azure AI Search): Handle GeoJSON GeographyPoint fields supplied as strings — writes documents with a StringType location column and verifies the index ingests them (any 400 would throw via fatalErrors = true).
  • Unit (no network):
    • convertGeographyPointToStruct parses GeoJSON strings into structs
    • convertGeographyPointToStruct leaves struct columns untouched
    • convertGeographyPointToStruct fails fast on malformed GeoJSON instead of silently nulling

Compatibility

  • Private helper only (private[ml]) — no public API changes.
  • Existing struct-based GeographyPoint usage path is unaffected.
  • No new dependencies.

Review feedback addressed

All 3 Copilot review comments have been addressed in 95a7ae1:

  1. Switched from_json to FAILFAST mode so malformed GeoJSON is not silently nulled.
  2. Clarified Scaladoc that conversion applies to top-level fields only (parity with convertDateTimeToISO8601).
  3. Added unit tests proving the parse / passthrough / fail-fast behavior, since the repo has no public per-document fetch helper for richer e2e content assertions.

…er (microsoft#2420)

Azure AI Search expects spatial values as GeoJSON objects, but when users
supplied a StringType column the writer JSON-escaped the entire string and
the service rejected the request with HTTP 400. Convert string GeographyPoint
columns into the canonical struct<type, coordinates> shape via from_json
before serialization, mirroring the existing Edm.DateTimeOffset handling.
Existing struct-based input is unchanged.
Copilot AI review requested due to automatic review settings April 25, 2026 19:18
@github-actions
Copy link
Copy Markdown

Hey @chon3806 👋!
Thank you so much for contributing to our repository 🙌.
Someone from SynapseML Team will be reviewing this pull request soon.

We use semantic commit messages to streamline the release process.
Before your pull request can be merged, you should make sure your first commit and PR title start with a semantic prefix.
This helps us to create release messages and credit you for your hard work!

Examples of commit messages with semantic prefixes:

  • fix: Fix LightGBM crashes with empty partitions
  • feat: Make HTTP on Spark back-offs configurable
  • docs: Update Spark Serving usage
  • build: Add codecov support
  • perf: improve LightGBM memory usage
  • refactor: make python code generation rely on classes
  • style: Remove nulls from CNTKModel
  • test: Add test coverage for CNTKModel

To test your commit locally, please follow our guild on building from source.
Check out the developer guide for additional guidance on testing your change.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes Azure AI Search ingestion failures when AzureSearchWriter is given Edm.GeographyPoint values in StringType columns containing GeoJSON by parsing those strings into the expected struct shape before JSON serialization.

Changes:

  • Added a private normalization step to parse StringType GeoJSON into struct<type:string, coordinates:array<double>> for Edm.GeographyPoint index fields.
  • Wired the new normalization into AzureSearchWriter.prepareDF before schema parity checks and request serialization.
  • Added an end-to-end Scala test covering GeographyPoint values supplied as strings.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.

File Description
cognitive/src/main/scala/com/microsoft/azure/synapse/ml/services/search/AzureSearch.scala Adds GeoJSON string → struct conversion for Edm.GeographyPoint fields and applies it during DF preparation.
cognitive/src/test/scala/com/microsoft/azure/synapse/ml/services/search/split2/SearchWriterSuitePart2.scala Adds an end-to-end test that writes docs with GeoJSON GeographyPoint stored as strings.

currentDF.schema(fieldName).dataType match {
case StringType =>
currentDF.withColumn(fieldName,
when(col(fieldName).isNotNull, from_json(col(fieldName), geoStructType))
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from_json defaults to permissive parsing, so malformed/invalid GeoJSON strings will be converted to null silently. That can lead to documents being ingested with a missing location (or unexpected null updates) instead of surfacing an error. Consider using from_json with mode=FAILFAST (or otherwise explicitly validating the parse result) so invalid GeoJSON fails loudly rather than being dropped.

Suggested change
when(col(fieldName).isNotNull, from_json(col(fieldName), geoStructType))
when(
col(fieldName).isNotNull,
from_json(col(fieldName), geoStructType, Map("mode" -> "FAILFAST"))
)

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 95a7ae1 -- switched to from_json(..., Map("mode" -> "FAILFAST")) and added a unit test (convertGeographyPointToStruct fails fast on malformed GeoJSON instead of silently nulling) that asserts a SparkException on materialization.

Comment on lines +263 to +280
* For each field declared as `Edm.GeographyPoint` in the index, if the corresponding
* DataFrame column is a `StringType`, parse it into the canonical
* `struct<type:string, coordinates:array<double>>` so that downstream `to_json`
* emits a proper GeoJSON object. Columns that are already structured are left as-is.
*
* @param df DataFrame with potential GeographyPoint columns
* @param indexJson JSON string containing the index schema
* @return DataFrame with string GeographyPoint columns converted to GeoJSON structs
*/
private def convertGeographyPointToStruct(df: DataFrame, indexJson: String): DataFrame = {
val geoStructType = StructType(Seq(
StructField("type", StringType),
StructField("coordinates", ArrayType(DoubleType))
))
val geoFields = parseIndexJson(indexJson).fields
.filter(_.`type` == "Edm.GeographyPoint")
.map(_.name)
geoFields.foldLeft(df) { (currentDF, fieldName) =>
Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Scaladoc says this runs "for each field declared as Edm.GeographyPoint in the index", but the implementation only inspects parseIndexJson(indexJson).fields (top-level fields) and won’t convert GeographyPoint values nested inside complex types. Either clarify the doc to state it’s top-level only, or extend the traversal to nested fields so behavior matches the comment.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 95a7ae1 -- updated the Scaladoc to state '''top-level''' explicitly and noted that the scope mirrors convertDateTimeToISO8601 (which has the same top-level-only limitation). Extending nested-field traversal felt out-of-scope for this bug fix; happy to do it as a follow-up if preferred.

Comment on lines +203 to +204
retryWithBackoff(assertSize(in, 2))

Copy link

Copilot AI Apr 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test only asserts document count after the write. If GeoJSON parsing were to fail and produce null (or otherwise lose the spatial payload), Azure Search could still ingest the documents and this test would pass. To make the test validate the intended behavior, consider fetching the stored documents (or querying/selecting location) and asserting the location field is present and shaped as a GeoJSON object (e.g., has type and coordinates).

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 95a7ae1. Two complementary guarantees now make the count check meaningful:

  1. The new FAILFAST parsing mode raises a SparkException on malformed GeoJSON before the request is even built (covered by convertGeographyPointToStruct fails fast on malformed GeoJSON ...).
  2. AzureSearchWriter.write runs with fatalErrors=true by default, so any 400 from the service throws a RuntimeException and fails the test before assertSize is reached.

Combined with the new unit tests that assert the converted struct shape and parsed coordinates directly, a count of 2 is only achievable if the documents were accepted as valid spatial objects. The repo's existing search tests follow the same assertSize-only pattern and there's no helper for fetching individual documents, so I kept the e2e style consistent.

…or GeographyPoint conversion

- Replace unicode em-dash with ASCII to avoid encoding/scalastyle surprises.
- Replace 'microsoft#2420' in Scaladoc (member-reference syntax) with a full URL.
- Make convertGeographyPointToStruct private[ml] so it can be exercised by
  in-tree unit tests without requiring live Azure Search credentials.
- Add two non-network unit tests covering the string->struct rewrite,
  null preservation, and the no-op path for already-structured columns.
@chon3806
Copy link
Copy Markdown
Author

@chon3806 please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@microsoft-github-policy-service agree

- Use Spark's FAILFAST parsing mode in from_json so malformed GeoJSON surfaces
  an explicit exception instead of being silently coerced to null and shipped
  to Azure Search.
- Clarify Scaladoc to state the conversion is top-level-only (mirroring
  convertDateTimeToISO8601), and document the FAILFAST behavior.
- Add a unit test asserting malformed GeoJSON fails fast at materialization.
- Document why the end-to-end test's count assertion is sufficient: with
  fatalErrors=true (default) any service-side rejection throws, so a passing
  count proves the documents were accepted as valid spatial objects.
@chon3806
Copy link
Copy Markdown
Author

Hi @BrendanWalsh — friendly nudge on this one when you have a moment. The CLA is signed, the semantic title check passes, and the Copilot review's 3 comments have all been addressed in 95a7ae1. CI hasn't run yet (fork PR — needs a maintainer to approve workflows). Happy to address any further feedback. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] AzureSearchWriter sends GeographyPoint field as JSON string instead of GeoJSON object, causing Azure AI Search request failure.

2 participants