changing schema naming by alexagriffith · Pull Request #100 · envoyproxy/ai-gateway

alexagriffith · 2025-01-15T16:58:24Z

changing all instances of inputSchema and outputSchema to schema for simplicity.
once that was done, the yaml file had a nested structure of schema.schema - schema can have two properties in it, schema and version. this is a bit redundant so schema.schema was changed to schema.name since the value is the name of the schema for a given versioned schema struct

Signed-off-by: Alexa Griffith <[email protected]>

mathetake · 2025-01-15T20:59:03Z

Could you keep the PR draft until all CI happy?

.gitignore

Signed-off-by: Alexa Griffith <[email protected]> change nested schema to name in structs Signed-off-by: Alexa Griffith <[email protected]> fix factory logic Signed-off-by: Alexa Griffith <[email protected]> rebase# This is a combination of 20 commits. fix some other schema names to be consistent Signed-off-by: Alexa Griffith <[email protected]> gitignore idea Signed-off-by: Alexa Griffith <[email protected]> fix missing name change Signed-off-by: Alexa Griffith <[email protected]> fix filterconfig Signed-off-by: Alexa Griffith <[email protected]> fix test Signed-off-by: Alexa Griffith <[email protected]> renaming Signed-off-by: Alexa Griffith <[email protected]> fix Signed-off-by: Alexa Griffith <[email protected]> fix sink test naming Signed-off-by: Alexa Griffith <[email protected]> fix controller test Signed-off-by: Alexa Griffith <[email protected]> add name rule Signed-off-by: Alexa Griffith <[email protected]> fix rule Signed-off-by: Alexa Griffith <[email protected]> rename klog pkg Signed-off-by: Alexa Griffith <[email protected]> fix cel tests Signed-off-by: Alexa Griffith <[email protected]> re-add openai pkg Signed-off-by: Alexa Griffith <[email protected]> fix llm backend yaml Signed-off-by: Alexa Griffith <[email protected]> fix backend Signed-off-by: Alexa Griffith <[email protected]> fix the code style Signed-off-by: Alexa Griffith <[email protected]> fix order Signed-off-by: Alexa Griffith <[email protected]> fix Signed-off-by: Alexa Griffith <[email protected]> lint Signed-off-by: Alexa Griffith <[email protected]>

yuzisun · 2025-01-15T23:21:40Z

internal/apischema/awsbedrock/awsbedrock.go

-	// InputSchema is a required field
-	InputSchema *ToolInputSchema `json:"inputSchema"`
+	// Schema is a required field
+	Schema *ToolSchema `json:"schema"`


This should not be changed, it is the AWS bedrock schema

offline discussion - fixed this. didn't realize this was a field required by aws and that their are issues using their api for these types.

note: I think we should have a test for if our hard coded fields and theirs misalign

Signed-off-by: Alexa Griffith <[email protected]>

internal/apischema/awsbedrock/awsbedrock.go

Signed-off-by: Takeshi Yoneda <[email protected]>

Krishanx92 · 2025-01-16T02:40:18Z

filterconfig/filterconfig.go

-// APISchema corresponds to APISchema in api/v1alpha1/api.go.
-type APISchema string
+// APISchemaName corresponds to APISchemaName in api/v1alpha1/api.go.
+type APISchemaName string


Given that the values are provider names, wouldn't APISchemaProviderName be more suitable than APISchemaName?

I dont have a big preference, open for discussion on this

Signed-off-by: Alexa Griffith <[email protected]>

yuzisun · 2025-01-16T22:13:06Z

@alexagriffith need to rebase your PR

Signed-off-by: Alexa Griffith <[email protected]>

yuzisun · 2025-01-17T21:47:30Z

internal/extproc/watcher_test.go

    weight: 1
-    outputSchema:
+    schema:
      schema: OpenAI


Need to update to name now

wonder why the CI did not complain

yuzisun · 2025-01-17T21:47:46Z

internal/extproc/watcher_test.go

    weight: 10
-    outputSchema:
+    schema:
      schema: AWSBedrock


yuzisun · 2025-01-17T21:48:17Z

internal/extproc/watcher_test.go

  - name: openai
-    outputSchema:
+    schema:
      schema: OpenAI


internal/extproc/watcher_test.go

Signed-off-by: Dan Sun <[email protected]>

internal/extproc/watcher_test.go

Signed-off-by: Dan Sun <[email protected]>

.gitignore

Signed-off-by: Dan Sun <[email protected]>

alexagriffith requested a review from a team as a code owner January 15, 2025 16:58

alexagriffith force-pushed the agriffith/rename-schema-props branch 2 times, most recently from 69d82c8 to bf0151d Compare January 15, 2025 17:30

alexagriffith and others added 3 commits January 15, 2025 12:46

changing schema naming

1cfda39

Signed-off-by: Alexa Griffith <[email protected]>

fix typo

74498d1

Signed-off-by: Alexa Griffith <[email protected]>

fix lint

d8b94d0

Signed-off-by: Alexa Griffith <[email protected]>

alexagriffith force-pushed the agriffith/rename-schema-props branch from a297206 to d8b94d0 Compare January 15, 2025 17:46

lint

7d96b48

Signed-off-by: Alexa Griffith <[email protected]>

alexagriffith marked this pull request as draft January 15, 2025 21:18

mathetake reviewed Jan 15, 2025

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

alexagriffith force-pushed the agriffith/rename-schema-props branch 2 times, most recently from 9ba2a3a to 068ce0e Compare January 15, 2025 22:56

alexagriffith force-pushed the agriffith/rename-schema-props branch from 068ce0e to 2e997d4 Compare January 15, 2025 22:57

alexagriffith marked this pull request as ready for review January 15, 2025 23:00

yuzisun reviewed Jan 15, 2025

View reviewed changes

revert bedrock udpate

6071621

Signed-off-by: Alexa Griffith <[email protected]>

yuzisun reviewed Jan 15, 2025

View reviewed changes

internal/apischema/awsbedrock/awsbedrock.go Outdated Show resolved Hide resolved

mathetake assigned yuzisun Jan 16, 2025

mathetake added a commit that referenced this pull request Jan 16, 2025

less conflict with #100

dba4b9f

Signed-off-by: Takeshi Yoneda <[email protected]>

Krishanx92 reviewed Jan 16, 2025

View reviewed changes

revert tool input schema naming

297b3dd

Signed-off-by: Alexa Griffith <[email protected]>

alexagriffith requested review from mathetake and yuzisun January 16, 2025 19:35

alexagriffith added 4 commits January 16, 2025 17:50

Merge branch 'main' into agriffith/rename-schema-props

93bb317

Signed-off-by: Alexa Griffith <[email protected]>

fix merge issues

8f8b7ca

Signed-off-by: Alexa Griffith <[email protected]>

merge fix

c61a6fc

Signed-off-by: Alexa Griffith <[email protected]>

fix self.schema to self.name

31cfbeb

Signed-off-by: Alexa Griffith <[email protected]>

alexagriffith added 6 commits January 16, 2025 18:08

fix merge

24975bd

Signed-off-by: Alexa Griffith <[email protected]>

fix ext proc and cel test

ea40466

Signed-off-by: Alexa Griffith <[email protected]>

fix unit test

4ca71b9

Signed-off-by: Alexa Griffith <[email protected]>

fix test

1d3f19b

Signed-off-by: Alexa Griffith <[email protected]>

add klog

7b4bc56

Signed-off-by: Alexa Griffith <[email protected]>

Merge branch 'main' into agriffith/rename-schema-props

2215b9f

Signed-off-by: Alexa Griffith <[email protected]>

alexagriffith force-pushed the agriffith/rename-schema-props branch from 309fb40 to 2215b9f Compare January 17, 2025 19:26

alexagriffith added 2 commits January 17, 2025 14:29

fix cel

fc7d066

Signed-off-by: Alexa Griffith <[email protected]>

fix test

ff98ebb

Signed-off-by: Alexa Griffith <[email protected]>

yuzisun reviewed Jan 17, 2025

View reviewed changes

internal/extproc/watcher_test.go Outdated

weight: 10

outputSchema:

schema:

schema: AWSBedrock

Copy link
Copy Markdown

Contributor

yuzisun Jan 17, 2025

Choose a reason for hiding this comment

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

same here

yuzisun reviewed Jan 17, 2025

View reviewed changes

internal/extproc/watcher_test.go Outdated

- name: openai

outputSchema:

schema:

schema: OpenAI

Copy link
Copy Markdown

Contributor

yuzisun Jan 17, 2025

Choose a reason for hiding this comment

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

same here