Skip to content
This repository was archived by the owner on Nov 20, 2025. It is now read-only.

fix: validate input schema using json schema validator #44

Open
mhmd-azeez wants to merge 16 commits into
base: main
Choose a base branch
from
Open

fix: validate input schema using json schema validator #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8bbb37
fix: validate input schema using json schema validator
mhmd-azeez Jan 26, 2025
e9fda06
fix build?
mhmd-azeez Jan 26, 2025
9e75181
match other js servlets
mhmd-azeez Jan 26, 2025
bae0364
back to 1.1.1
mhmd-azeez Jan 26, 2025
793f4b4
remove @extism/js-pdk from references
mhmd-azeez Jan 26, 2025
5a34fad
revert
mhmd-azeez Jan 26, 2025
fe958f1
simplify the input schema
mhmd-azeez Jan 27, 2025
f6526d0
missing npm install in makefile
Jan 27, 2025
b47ae02
Merge pull request #49 from dylibso/chris/20250127-just-a-test-of-the…
mhmd-azeez Jan 27, 2025
46ba024
build simulation last
mhmd-azeez Jan 28, 2025
01e80a8
add more requirements on input schema
mhmd-azeez Feb 3, 2025
b8aa416
update xtp-test-js
mhmd-azeez Feb 3, 2025
c8a7ca8
update npm lock file
mhmd-azeez Feb 3, 2025
b28fc9b
fix github servlet: assignees is an array
mhmd-azeez Feb 3, 2025
fbc8c26
fix input schemas for the remaining servlets
mhmd-azeez Feb 4, 2025
4c35f97
Merge branch 'main' into validate-input-schema
mhmd-azeez Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:

- name: Install TinyGo
run: |
wget https://github.com/tinygo-org/tinygo/releases/download/v0.34.0/tinygo_0.34.0_amd64.deb
sudo dpkg -i tinygo_0.34.0_amd64.deb
wget https://github.com/tinygo-org/tinygo/releases/download/v0.35.0/tinygo_0.35.0_amd64.deb
sudo dpkg -i tinygo_0.35.0_amd64.deb

- name: Install extism-js
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:

- name: Install TinyGo
run: |
wget https://github.com/tinygo-org/tinygo/releases/download/v0.34.0/tinygo_0.34.0_amd64.deb
sudo dpkg -i tinygo_0.34.0_amd64.deb
wget https://github.com/tinygo-org/tinygo/releases/download/v0.35.0/tinygo_0.35.0_amd64.deb
sudo dpkg -i tinygo_0.35.0_amd64.deb

- name: Install extism-js
run: |
Expand Down
4 changes: 4 additions & 0 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ prepare:
build:
#!/usr/bin/env bash
set -eou pipefail

for dir in servlets/*/; do
cd "$dir"
echo "Building $dir"
Expand All @@ -21,6 +22,9 @@ build:
cd ../..
done

cd simulations/describe-output
make build

push:
#!/usr/bin/env bash
set -eou pipefail
Expand Down
4 changes: 4 additions & 0 deletions servlets/amadeus-flight-api/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "amadeus-flight-api"

# xtp plugin init runs this script before running the format script
prepare = "sh prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/assembly-ai/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ format = "go fmt && go mod tidy && goimports -w main.go"

# xtp plugin init runs this script before running the format script
prepare = "sh prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/crypto-hash/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "crypto-hash"

# xtp plugin init runs this script before running the format script
prepare = "bash prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
Comment on lines +19 to +21
Copy link
Copy Markdown
Contributor

@bhelx bhelx Apr 29, 2025

Choose a reason for hiding this comment

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

what's the difference b/w using this local test and letting xtp handle the validation when pushing?

Copy link
Copy Markdown
Contributor Author

@mhmd-azeez mhmd-azeez Apr 30, 2025

Choose a reason for hiding this comment

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

I was mainly using this to make sure all of the servlets are passing the validation (since this new version hasn't been pushed to xtp yet)

5 changes: 5 additions & 0 deletions servlets/currency-converter/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ name = "currency-converter"
[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"

4 changes: 4 additions & 0 deletions servlets/eval-py/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ name = "eval-py"
[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/eval_js/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ name = "eval_js"
[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/fetch/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ prepare = "bash prepare.sh"
[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/filesystem/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ format = "cargo fmt"

# xtp plugin init runs this script before running the format script
prepare = "bash prepare.sh"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 2 additions & 2 deletions servlets/github/issues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var (
"title": prop("string", "The title of the issue"),
"body": prop("string", "The body of the issue"),
"state": prop("string", "The state of the issue"),
"assignees": arrprop("string", "The assignees of the issue", "string"),
"assignees": arrprop("The assignees of the issue", "string"),
"milestone": prop("integer", "The milestone of the issue"),
},
"required": []string{"owner", "repo", "title", "body"},
Expand Down Expand Up @@ -89,7 +89,7 @@ var (
"title": prop("string", "The title of the issue"),
"body": prop("string", "The body of the issue"),
"state": prop("string", "The state of the issue"),
"assignees": arrprop("string", "The assignees of the issue", "string"),
"assignees": arrprop("The assignees of the issue", "string"),
"milestone": prop("integer", "The milestone of the issue"),
},
"required": []string{"owner", "repo", "issue"},
Expand Down
4 changes: 2 additions & 2 deletions servlets/github/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ func prop(tpe, description string) SchemaProperty {
return SchemaProperty{Type: tpe, Description: description}
}

func arrprop(tpe, description, itemstpe string) SchemaProperty {
func arrprop(description, itemstpe string) SchemaProperty {
items := schema{"type": itemstpe}
return SchemaProperty{Type: tpe, Description: description, Items: &items}
return SchemaProperty{Type: "array", Description: description, Items: &items}
}

type schema = map[string]interface{}
Expand Down
4 changes: 4 additions & 0 deletions servlets/github/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "github"

# xtp plugin init runs this script before running the format script
prepare = "sh prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/google-maps-image/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "google-maps-image"

# xtp plugin init runs this script before running the format script
prepare = "sh prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
20 changes: 16 additions & 4 deletions servlets/google-maps/src/tools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,14 @@ export const SEARCH_PLACES_TOOL: ToolDescription = {
location: {
type: "object",
properties: {
latitude: { type: "number" },
longitude: { type: "number" }
latitude: {
type: "number",
description: "Latitude coordinate for the center point"
},
longitude: {
type: "number",
description: "Longitude coordinate for the center point"
}
},
description: "Optional center point for the search"
},
Expand Down Expand Up @@ -114,8 +120,14 @@ export const ELEVATION_TOOL: ToolDescription = {
items: {
type: "object",
properties: {
latitude: { type: "number" },
longitude: { type: "number" }
latitude: {
type: "number",
description: "Latitude coordinate of the location"
},
longitude: {
type: "number",
description: "Longitude coordinate of the location"
}
},
required: ["latitude", "longitude"]
},
Expand Down
4 changes: 4 additions & 0 deletions servlets/google-maps/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "google-maps"

# xtp plugin init runs this script before running the format script
prepare = "bash prepare.sh"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
6 changes: 5 additions & 1 deletion servlets/greet/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ name = "greet"

[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/historical-flight-api/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "historical-flight-api"

# xtp plugin init runs this script before running the format script
prepare = "bash prepare.sh && go get ./..."

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
4 changes: 4 additions & 0 deletions servlets/ipfs/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ name = "ipfs"

# xtp plugin init runs this script before running the format script
prepare = "bash prepare.sh"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
6 changes: 5 additions & 1 deletion servlets/json-schema/xtp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ name = "json-schema"

[[test]]
name = "basic tests"
with = "../../test/testsuite/dist/test.wasm"
with = "../../test/testsuite/dist/test.wasm"

[[test]]
name = "describe output"
with = "../../simulations/describe-output/dist/plugin.wasm"
Loading
Loading