From 9d5f29a4951265cf3d66ce249f5b71866469aaf4 Mon Sep 17 00:00:00 2001 From: Eddie Date: Fri, 17 Jan 2025 18:41:22 -0300 Subject: [PATCH 1/6] added new metadata fields --- .../src/components/playground-tool/schemas.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/shinkai-desktop/src/components/playground-tool/schemas.ts b/apps/shinkai-desktop/src/components/playground-tool/schemas.ts index 99aaa9883..028bd7c68 100644 --- a/apps/shinkai-desktop/src/components/playground-tool/schemas.ts +++ b/apps/shinkai-desktop/src/components/playground-tool/schemas.ts @@ -5,7 +5,7 @@ export const ToolMetadataSchema = z.object({ .string({ message: 'Tool name is required' }) .min(1, 'Tool name is required') .max(100, 'Tool name must be less than 100 characters'), - + homePage: z.string().optional().default(''), description: z .string({ message: 'Tool description is required' }) .min(1, 'Tool description is required') @@ -67,9 +67,9 @@ export const ToolMetadataSchema = z.object({ clientId: z.string().default('YOUR_PROVIDER_CLIENT_ID'), clientSecret: z.string().default('YOUR_PROVIDER_CLIENT_SECRET'), scopes: z.array(z.string()).default([]), - grantType: z.string().default('authorization_code'), + responseType: z.string().default('code'), + pkceType: z.string().default(''), refreshToken: z.string().default(''), - accessToken: z.string().default(''), }), ).default([]), }); From 10c97424d094c1a5213d199ecaafaa3d98fd68dd Mon Sep 17 00:00:00 2001 From: Alfredo Gallardo Date: Sun, 19 Jan 2025 20:21:55 -0300 Subject: [PATCH 2/6] chore: disabled code signing --- .github/workflows/release-prod.yml | 76 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 80a4ea633..74432a7fc 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -256,47 +256,47 @@ jobs: NODE_OPTIONS: "--max_old_space_size=8192" # --- Signing process --- - - name: 'Google auth' - if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - id: 'auth' - uses: 'google-github-actions/auth@v2' - with: - workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' - service_account: '${{ secrets.SERVICE_ACCOUNT }}' - - - name: 'Set up Cloud SDK' - if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - uses: 'google-github-actions/setup-gcloud@v2' - with: - project_id: 'shinkai-412316' - + # - name: 'Google auth' + # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} + # id: 'auth' + # uses: 'google-github-actions/auth@v2' + # with: + # workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' + # service_account: '${{ secrets.SERVICE_ACCOUNT }}' - - name: Set up Java - if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: 'temurin' - - name: Download Jsign - run: wget https://github.com/ebourg/jsign/releases/download/7.0/jsign-7.0.jar + # - name: 'Set up Cloud SDK' + # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} + # uses: 'google-github-actions/setup-gcloud@v2' + # with: + # project_id: 'shinkai-412316' - - name: Cert to file - if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - run: | - echo -n "$EV_CODE_SIGNING_CERTIFICATE" | base64 --decode -o OS20241029372986.pem - - name: Sign - if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - run: > - java -jar jsign.jar \ - --storetype GOOGLECLOUD \ - --storepass "$(gcloud auth print-access-token)" \ - --keystore "projects/shinkai-412316/locations/us/keyRings/shinkai-apps" \ - --alias "EVCodeSigning" \ - --certfile "OS20241029372986.pem" \ - --tsmode RFC3161 \ - --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \ - ${{ matrix.build_output_file_path }} + # - name: Set up Java + # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} + # uses: actions/setup-java@v4 + # with: + # java-version: 17 + # distribution: 'temurin' + # - name: Download Jsign + # run: wget https://github.com/ebourg/jsign/releases/download/7.0/jsign-7.0.jar + + # - name: Cert to file + # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} + # run: | + # echo -n "$EV_CODE_SIGNING_CERTIFICATE" | base64 --decode -o OS20241029372986.pem + + # - name: Sign + # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} + # run: > + # java -jar jsign.jar \ + # --storetype GOOGLECLOUD \ + # --storepass "$(gcloud auth print-access-token)" \ + # --keystore "projects/shinkai-412316/locations/us/keyRings/shinkai-apps" \ + # --alias "EVCodeSigning" \ + # --certfile "OS20241029372986.pem" \ + # --tsmode RFC3161 \ + # --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \ + # ${{ matrix.build_output_file_path }} # --- - name: Prepare binary files From 526a65d1691486a4faeb64237a87bdc7c0f35b55 Mon Sep 17 00:00:00 2001 From: Nico Arqueros Date: Sun, 19 Jan 2025 23:33:51 -0600 Subject: [PATCH 3/6] bump --- .github/workflows/pr-ci-healchecks.yml | 2 +- .github/workflows/release-dev.yml | 2 +- .github/workflows/release-prod.yml | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr-ci-healchecks.yml b/.github/workflows/pr-ci-healchecks.yml index c25a0e015..9d61ad91c 100644 --- a/.github/workflows/pr-ci-healchecks.yml +++ b/.github/workflows/pr-ci-healchecks.yml @@ -37,7 +37,7 @@ jobs: - name: Download side binaries env: ARCH: x86_64-unknown-linux-gnu - SHINKAI_NODE_VERSION: v0.9.5 + SHINKAI_NODE_VERSION: v0.9.6 OLLAMA_VERSION: v0.5.4 run: | npx ts-node ./ci-scripts/download-side-binaries.ts diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml index dbca71e6f..df49b18ef 100644 --- a/.github/workflows/release-dev.yml +++ b/.github/workflows/release-dev.yml @@ -208,7 +208,7 @@ jobs: - name: Download side binaries env: ARCH: ${{ matrix.arch }} - SHINKAI_NODE_VERSION: v0.9.5 + SHINKAI_NODE_VERSION: v0.9.6 OLLAMA_VERSION: v0.5.4 run: | npx ts-node ./ci-scripts/download-side-binaries.ts diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 74432a7fc..f55af2b6f 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -209,7 +209,7 @@ jobs: - name: Download side binaries env: ARCH: ${{ matrix.arch }} - SHINKAI_NODE_VERSION: v0.9.5 + SHINKAI_NODE_VERSION: v0.9.6 OLLAMA_VERSION: v0.5.4 run: | npx ts-node ./ci-scripts/download-side-binaries.ts diff --git a/README.md b/README.md index dbb1c49ef..c2f511994 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ $ git clone https://github.com/dcSpark/shinkai-apps ``` ARCH="aarch64-apple-darwin" \ OLLAMA_VERSION="v0.5.4" \ -SHINKAI_NODE_VERSION="v0.9.5" \ +SHINKAI_NODE_VERSION="v0.9.6" \ npx ts-node ./ci-scripts/download-side-binaries.ts ``` @@ -54,14 +54,14 @@ npx ts-node ./ci-scripts/download-side-binaries.ts ``` ARCH="x86_64-unknown-linux-gnu" \ OLLAMA_VERSION="v0.5.4"\ -SHINKAI_NODE_VERSION="v0.9.5" \ +SHINKAI_NODE_VERSION="v0.9.6" \ npx ts-node ./ci-scripts/download-side-binaries.ts ``` #### Windows ``` $ENV:OLLAMA_VERSION="v0.5.4" -$ENV:SHINKAI_NODE_VERSION="v0.9.5" +$ENV:SHINKAI_NODE_VERSION="v0.9.6" $ENV:ARCH="x86_64-pc-windows-msvc" npx ts-node ./ci-scripts/download-side-binaries.ts ``` From 1da465ab81ec040637050bd83ee335c2c7efe949 Mon Sep 17 00:00:00 2001 From: Alfredo Gallardo Date: Mon, 20 Jan 2025 11:14:14 -0300 Subject: [PATCH 4/6] chore: added ci (#605) * chore: added ci * chore: fix workflow name * chore: fix runs on * chore: removed service account * chore: fix wrong identity provider name * chore: fix download jsign * chore: fix base64 * chore: fix cert to file * chore: fix sign command * chore: fix jsign file name * chore: install jsign with choco * chore: fix prod release * chore: removed unused file --- .github/workflows/release-prod.yml | 74 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index f55af2b6f..e053ef841 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -256,47 +256,45 @@ jobs: NODE_OPTIONS: "--max_old_space_size=8192" # --- Signing process --- - # - name: 'Google auth' - # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - # id: 'auth' - # uses: 'google-github-actions/auth@v2' - # with: - # workload_identity_provider: '${{ secrets.WIF_PROVIDER }}' - # service_account: '${{ secrets.SERVICE_ACCOUNT }}' + - name: 'Google auth' + id: 'auth' + uses: 'google-github-actions/auth@v2' + with: + project_id: 'shinkai-412316' + workload_identity_provider: 'projects/511721742630/locations/global/workloadIdentityPools/github/providers/shinkai-apps' - # - name: 'Set up Cloud SDK' - # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - # uses: 'google-github-actions/setup-gcloud@v2' - # with: - # project_id: 'shinkai-412316' + - name: 'Set up Cloud SDK' + uses: 'google-github-actions/setup-gcloud@v2' + with: + project_id: 'shinkai-412316' + - name: Set up Java + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: 'temurin' - # - name: Set up Java - # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - # uses: actions/setup-java@v4 - # with: - # java-version: 17 - # distribution: 'temurin' - # - name: Download Jsign - # run: wget https://github.com/ebourg/jsign/releases/download/7.0/jsign-7.0.jar - - # - name: Cert to file - # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - # run: | - # echo -n "$EV_CODE_SIGNING_CERTIFICATE" | base64 --decode -o OS20241029372986.pem - - # - name: Sign - # if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} - # run: > - # java -jar jsign.jar \ - # --storetype GOOGLECLOUD \ - # --storepass "$(gcloud auth print-access-token)" \ - # --keystore "projects/shinkai-412316/locations/us/keyRings/shinkai-apps" \ - # --alias "EVCodeSigning" \ - # --certfile "OS20241029372986.pem" \ - # --tsmode RFC3161 \ - # --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \ - # ${{ matrix.build_output_file_path }} + - name: Download Jsign + shell: bash + run: choco install jsign + + - name: Cert to file + shell: bash + run: | + echo -n "$EV_CODE_SIGNING_CERTIFICATE" > OS20241029372986.cer + + - name: Sign + shell: bash + run: > + jsign \ + --storetype GOOGLECLOUD \ + --storepass "$(gcloud auth print-access-token)" \ + --keystore "projects/shinkai-412316/locations/us/keyRings/shinkai-apps" \ + --alias "EVCodeSigning" \ + --certfile "OS20241029372986.cer" \ + --tsmode RFC3161 \ + --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \ + ${{ matrix.build_output_file_path }} # --- - name: Prepare binary files From cb92f9ad50369c073576b092d2940da8dd331344 Mon Sep 17 00:00:00 2001 From: Alfredo Gallardo Date: Mon, 20 Jan 2025 12:17:23 -0300 Subject: [PATCH 5/6] chore: add missing conditional to ci prod --- .github/workflows/release-prod.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index e053ef841..5a0b483e4 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -258,32 +258,38 @@ jobs: # --- Signing process --- - name: 'Google auth' id: 'auth' + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} uses: 'google-github-actions/auth@v2' with: project_id: 'shinkai-412316' workload_identity_provider: 'projects/511721742630/locations/global/workloadIdentityPools/github/providers/shinkai-apps' - name: 'Set up Cloud SDK' + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} uses: 'google-github-actions/setup-gcloud@v2' with: project_id: 'shinkai-412316' - name: Set up Java + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' - name: Download Jsign + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} shell: bash run: choco install jsign - name: Cert to file + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} shell: bash run: | echo -n "$EV_CODE_SIGNING_CERTIFICATE" > OS20241029372986.cer - name: Sign + if: ${{ matrix.arch == 'x86_64-pc-windows-msvc' }} shell: bash run: > jsign \ From f13f8e476b35bb89126837e761d74d796ddedda8 Mon Sep 17 00:00:00 2001 From: Alfredo Gallardo Date: Mon, 20 Jan 2025 13:18:51 -0300 Subject: [PATCH 6/6] Actualizar release-prod.yml --- .github/workflows/release-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 5a0b483e4..a759fe494 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -300,7 +300,7 @@ jobs: --certfile "OS20241029372986.cer" \ --tsmode RFC3161 \ --tsaurl http://timestamp.globalsign.com/tsa/r6advanced1 \ - ${{ matrix.build_output_file_path }} + "${{ matrix.build_output_file_path }}" # --- - name: Prepare binary files