Post upstream merge fixes (danny-avila#1162)

- disable GPT plugins
- disable runCode in UI
- update test scrips
- update Containerfile to fix the image build
- delete unused Github workflows

Author: sbruel

.env.shopify.example

@@ -24,7 +24,7 @@ NO_INDEX=true
 DEBUG_LOGGING=true
 DEBUG_CONSOLE=true
 CONSOLE_JSON=true
-ENDPOINTS=openAI,gptPlugins,agents
+ENDPOINTS=openAI,agents
 DEBUG_OPENAI=false
 TITLE_CONVO=true
 OPENAI_TITLE_MODEL=gpt-3.5-turbo

.github/workflows/data-schemas.yml

@@ -1,4 +1,4 @@
-# v0.7.6
+# v0.7.8
 
 # Base image
 FROM us-docker.pkg.dev/shopify-docker-images/containers/prod-kit/production/node-ubuntu-v3:main as base-min
@@ -56,6 +56,16 @@ RUN npm cache clean --force
 RUN npm run build
 RUN npm prune --production
 
+# Build data-schemas
+FROM base AS data-schemas-build
+WORKDIR /app/packages/data-schemas
+COPY packages/data-schemas ./
+COPY --from=data-provider-build /app/packages/data-provider/dist /app/packages/data-provider/dist
+RUN npm install --production=false
+RUN npm cache clean --force
+RUN npm run build
+RUN npm prune --production
+
 # Client build
 FROM base as client-build
 WORKDIR /app/client
@@ -67,22 +77,23 @@ RUN npm cache clean --force
 RUN npm run build
 RUN npm prune --production
 
-# Build Shopify & api
+# Build Shopify
 FROM base as shopify-build
 WORKDIR /app
-COPY api/ api/
 COPY shopify/ shopify/
-RUN cd api && npm install --production
-RUN cd shopify && npm install --production
+RUN cd shopify && npm ci && npm prune --production && npm cache clean --force
 
 # Final step
 FROM base-min as api-build
 WORKDIR /app
-COPY --from=shopify-build /app/api /app/api
+RUN npm ci --omit=dev
+COPY api ./api
 COPY --from=shopify-build /app/shopify /app/shopify
-COPY --from=data-provider-build /app/packages/data-provider/dist ./packages/data-provider/dist
-COPY --from=mcp-build /app/packages/mcp/dist ./packages/mcp/dist
+COPY --from=data-provider-build /app/packages/data-provider /app/packages/data-provider
+COPY --from=mcp-build /app/packages/mcp /app/packages/mcp
+COPY --from=data-schemas-build /app/packages/data-schemas /app/packages/data-schemas
 COPY --from=client-build /app/client/dist ./client/dist
+
 WORKDIR /app/api
 
 COPY Procfile /app/Procfile
@@ -114,7 +125,7 @@ ENV DOMAIN_CLIENT=https://chat.shopify.io \
     DEBUG_LOGGING=false \
     DEBUG_CONSOLE=true \
     CONSOLE_JSON=true \
-    ENDPOINTS=openAI,gptPlugins,agents \
+    ENDPOINTS=openAI,agents \
     DEBUG_OPENAI=false \
     TITLE_CONVO=true \
     OPENAI_TITLE_MODEL=gpt-3.5-turbo \

.github/workflows/generate-release-changelog-pr.yml

@@ -50,8 +50,7 @@ if (!LDAP_URL || !LDAP_USER_SEARCH_BASE) {
     searchAttributes.push(LDAP_EMAIL);
   }
   const rejectUnauthorized = isEnabled(LDAP_TLS_REJECT_UNAUTHORIZED);
-  sconst
-  startTLS = isEnabled(LDAP_STARTTLS);
+  const startTLS = isEnabled(LDAP_STARTTLS);
 
   const ldapOptions = {
     server: {
@@ -74,7 +73,7 @@ if (!LDAP_URL || !LDAP_USER_SEARCH_BASE) {
           })(),
         },
       }),
-      ...(startTLS && { starttls: true }), s
+      ...(startTLS && { starttls: true }),
     },
     usernameField: 'email',
     passwordField: 'password',
@@ -100,7 +99,8 @@ if (!LDAP_URL || !LDAP_USER_SEARCH_BASE) {
       const username =
         (LDAP_USERNAME && userinfo[LDAP_USERNAME]) || userinfo.givenName || userinfo.mail;
 
-      const mail = (LDAP_EMAIL && userinfo[LDAP_EMAIL]) || userinfo.mail || username + '@ldap.local';
+      const mail =
+        (LDAP_EMAIL && userinfo[LDAP_EMAIL]) || userinfo.mail || username + '@ldap.local';
 
       if (!userinfo.mail && !(LDAP_EMAIL && userinfo[LDAP_EMAIL])) {
         logger.warn(
@@ -140,9 +140,9 @@ if (!LDAP_URL || !LDAP_USER_SEARCH_BASE) {
       done(null, user);
     } catch (err) {
       logger.error('[ldapStrategy]', err);
-    done(err);
-  }
-});
+      done(err);
+    }
+  });
 
-module.exports = ldapLogin;
+  module.exports = ldapLogin;
 }

.github/workflows/generate-unreleased-changelog-pr.yml

@@ -1,4 +1,4 @@
-version: 1.2.1
+version: 1.2.4
 cache: true
 
 fileConfig:
@@ -138,6 +138,9 @@ includedTools:
   - dalle
   - calculator
 
+interface:
+  runCode: false
+
 mcpServers:
   vault-set-search:
     type: 'stdio'