fix(ai-constructs): invalid graphql generation for query tools

[atierian]

Problem

1. Data tool definitions with inputSchema.properties: {} generates invalid GraphQL.

This is a test we have today, which works as expected.

  {
    toolDefinition: {
      name: 'toolName2',
      description: 'toolDescription2',
      inputSchema: {
        json: {},
      },
      graphqlRequestInputDescriptor: {
        queryName: 'testQueryName2',
        selectionSet: 'testSelection3 testSelection4',
        propertyTypes: {},
      },
    },
    expectedQuery: `
    query ToolQuery {
      testQueryName2 {
        testSelection3 testSelection4
      }
    }
    `,
  },

The inputSchema: { json: {} } is what the resolver should be passing the lambda if there aren’t any arguments. But apparently in some cases. we’re sending this (which is also a valid tool definition):

toolDefinition: {
  name: 'toolName3',
  description: 'toolDescription3',
  inputSchema: {
    json: {
      type: 'object',
      properties: {},
      required: [],
    },
  },
},

I'll make the fix in the transformer to ensure we send json: {} for input-less queries, but let's still be defensive about checking for the second case in the lambda.

2. Scalar return types in tools generates invalid GraphQL selection set ({ } )

A scalar return type shouldn’t have a selection set. e.g.

graphqlRequestInputDescriptor: {
  queryName: 'testQueryName3',
  selectionSet: '',
  propertyTypes: {},
},

should generate

query ToolQuery {
  testQueryName3
}

but it currently generates

query ToolQuery {
  testQueryName3 { }
}

which is invalid GraphQL.

That’s because we wrap the provided selection set in { } here.

Issue number, if available:

Changes

1. Adds check for Object.keys(properties).length === 0) to catch inputSchema.json.properties: {} case.

2. Conditionally wraps provided selection set in { } only if the selection set is not empty.

Corresponding docs PR, if applicable:

Validation

Checklist

• If this PR includes a functional change to the runtime behavior of the code, I have added or updated automated test coverage for this change.
• If this PR requires a change to the Project Architecture README, I have included that update in this PR.
• If this PR requires a docs update, I have linked to that docs PR above.
• If this PR modifies E2E tests, makes changes to resource provisioning, or makes SDK calls, I have run the PR checks with the run-e2e label set.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

[changeset-bot]

🦋 Changeset detected

Latest commit: cf82bd2

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package

Name	Type
@aws-amplify/ai-constructs	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR