zapier-platform-cli 16.2.0 → 16.3.1

package/oclif.manifest.json

@@ -349,6 +349,7 @@
             "minimal",
             "oauth1-trello",
             "oauth2",
+            "openai",
             "search-or-create",
             "session-auth",
             "typescript"
@@ -1061,6 +1062,13 @@
           "name": "invokedFromAnotherCommand",
           "allowNo": false,
           "type": "boolean"
+        },
+        "overwrite-partner-changes": {
+          "description": "(Internal Use Only) Allows Zapier Staff to push changes to integrations in certain situations.",
+          "hidden": true,
+          "name": "overwrite-partner-changes",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1696,88 +1704,6 @@
         "list.js"
       ]
     },
-    "delete:integration": {
-      "aliases": [
-        "delete:app"
-      ],
-      "args": {},
-      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:integration",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "integration.js"
-      ]
-    },
-    "delete:version": {
-      "aliases": [],
-      "args": {
-        "version": {
-          "description": "Specify the version to delete. It must have no users or Zaps.",
-          "name": "version",
-          "required": true
-        }
-      },
-      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
-      "flags": {
-        "debug": {
-          "char": "d",
-          "description": "Show extra debugging output.",
-          "name": "debug",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "invokedFromAnotherCommand": {
-          "hidden": true,
-          "name": "invokedFromAnotherCommand",
-          "allowNo": false,
-          "type": "boolean"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "delete:version",
-      "pluginAlias": "zapier-platform-cli",
-      "pluginName": "zapier-platform-cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "skipValidInstallCheck": true,
-      "isESM": false,
-      "relativePath": [
-        "src",
-        "oclif",
-        "commands",
-        "delete",
-        "version.js"
-      ]
-    },
     "env:get": {
       "aliases": [],
       "args": {
@@ -1954,6 +1880,88 @@
         "unset.js"
       ]
     },
+    "delete:integration": {
+      "aliases": [
+        "delete:app"
+      ],
+      "args": {},
+      "description": "Delete your integration (including all versions).\n\nThis only works if there are no active users or Zaps on any version. If you only want to delete certain versions, use the `zapier delete:version` command instead. It's unlikely that you'll be able to run this on an app that you've pushed publicly, since there are usually still users.",
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete:integration",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "delete",
+        "integration.js"
+      ]
+    },
+    "delete:version": {
+      "aliases": [],
+      "args": {
+        "version": {
+          "description": "Specify the version to delete. It must have no users or Zaps.",
+          "name": "version",
+          "required": true
+        }
+      },
+      "description": "Delete a specific version of your integration.\n\nThis only works if there are no users or Zaps on that version. You will probably need to have run `zapier migrate` and `zapier deprecate` before this command will work.",
+      "flags": {
+        "debug": {
+          "char": "d",
+          "description": "Show extra debugging output.",
+          "name": "debug",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "invokedFromAnotherCommand": {
+          "hidden": true,
+          "name": "invokedFromAnotherCommand",
+          "allowNo": false,
+          "type": "boolean"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "delete:version",
+      "pluginAlias": "zapier-platform-cli",
+      "pluginName": "zapier-platform-cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "skipValidInstallCheck": true,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "oclif",
+        "commands",
+        "delete",
+        "version.js"
+      ]
+    },
     "team:add": {
       "aliases": [
         "team:invite"
@@ -2333,5 +2341,5 @@
       ]
     }
   },
-  "version": "16.2.0"
+  "version": "16.3.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zapier-platform-cli",
-  "version": "16.2.0",
+  "version": "16.3.1",
   "description": "The CLI for managing integrations in Zapier Developer Platform.",
   "repository": "zapier/zapier-platform",
   "homepage": "https://platform.zapier.com/",

package/src/generators/index.js

@@ -201,6 +201,7 @@ const TEMPLATE_ROUTES = {
   minimal: writeForMinimalTemplate,
   'oauth1-trello': writeForAuthTemplate,
   oauth2: writeForAuthTemplate,
+  openai: writeForStandaloneTemplate,
   'search-or-create': writeForStandaloneTemplate,
   'session-auth': writeForAuthTemplate,
   typescript: writeForStandaloneTypeScriptTemplate,

package/src/generators/pull.js

@@ -24,7 +24,10 @@ module.exports = class PullGenerator extends Generator {
         name: 'confirm',
         message: `Warning: You are about to overwrite existing files.
 
-Before proceeding, please make sure you have saved your work. Consider creating a backup or saving your current state in a git branch. During the process, you may abort anytime by pressing 'x'.
+Before proceeding, please make sure you have saved your work. Consider creating a backup or saving your current state in a git branch.
+
+If presented with a series of options ('ynarxdeiH'), you may
+press Enter to view more details about each option. For example, 'x' will abort the process.
 
 Do you want to continue?`,
         default: false,

package/src/generators/templates/openai/README.md

@@ -0,0 +1,3 @@
+# OpenAI
+
+This Zapier integration project is generated by the `zapier init` CLI command. This integration in particular is using the OpenAI API to generate responses to prompts from users. For this integration, there is a `constants.js` file that will allow you to swap out the base URL and version of the API to swap if you are using an OpenAI compatible API to get started.

package/src/generators/templates/openai/authentication.js

@@ -0,0 +1,46 @@
+const { API_URL } = require('./constants');
+// You want to make a request to an endpoint that is either specifically designed
+// to test auth, or one that every user will have access to. eg: `/me`.
+// By returning the entire request object, you have access to the request and
+// response data for testing purposes. Your connection label can access any data
+// from the returned response using the `json.` prefix. eg: `{{json.username}}`.
+const test = (z, bundle) => z.request({ url: `${API_URL}/me` });
+
+module.exports = {
+  // "custom" is the catch-all auth type. The user supplies some info and Zapier can
+  // make authenticated requests with it
+  type: 'custom',
+
+  // Define any input app's auth requires here. The user will be prompted to enter
+  // this info when they connect their account.
+  fields: [
+    {
+      key: 'api_key',
+      label: 'API Key',
+      required: true,
+      helpText:
+        'Generate an API Key in your [Platform settings page](https://platform.openai.com/api-keys).',
+    },
+    // This field is optional and can be removed if not needed
+    {
+      key: 'organization_id',
+      required: false,
+      label: 'Organization ID',
+      helpText:
+        '**Optional** Only required if your OpenAI account belongs to multiple organizations. If not using OpenAI, this field will be disregarded. If your OpenAI account belongs to multiple organizations, optionally add the [Organization ID](https://platform.openai.com/account/org-settings) that this connection should use. If left blank, your [default organization](https://platform.openai.com/account/api-keys) will be used.',
+    },
+  ],
+
+  // The test method allows Zapier to verify that the credentials a user provides
+  // are valid. We'll execute this method whenever a user connects their account for
+  // the first time.
+  test,
+
+  // This template string can access all the data returned from the auth test. If
+  // you return the test object, you'll access the returned data with a label like
+  // `{{json.X}}`. If you return `response.data` from your test, then your label can
+  // be `{{X}}`. This can also be a function that returns a label. That function has
+  // the standard args `(z, bundle)` and data returned from the test can be accessed
+  // in `bundle.inputData.X`.
+  connectionLabel: '{{json.email}}',
+};

package/src/generators/templates/openai/constants.js

@@ -0,0 +1,10 @@
+const BASE_URL = 'https://api.openai.com';
+const VERSION = 'v1';
+const API_URL = `${BASE_URL}/${VERSION}`;
+
+const DEFAULT_MODEL = 'gpt-4o-mini';
+
+module.exports = {
+  API_URL,
+  DEFAULT_MODEL,
+};

package/src/generators/templates/openai/creates/chat_completion.js

@@ -0,0 +1,164 @@
+/* eslint-disable camelcase */
+const { API_URL, DEFAULT_MODEL } = require('../constants');
+
+const sample = require('../samples/chat.json');
+
+async function getAdvancedFields(_z, bundle) {
+  if (bundle.inputData.show_advanced === true) {
+    return [
+      {
+        key: 'info_advanced',
+        type: 'copy',
+        helpText:
+          "The following fields are for advanced users and should be used with caution as they may affect performance. In most cases, the default options are sufficient. If you'd like to explore these options further, you can [learn more here](https://help.zapier.com/hc/en-us/articles/22497191078797).",
+      },
+      {
+        key: 'developer_message',
+        label: 'Developer/System Message',
+        type: 'text',
+        helpText:
+          'Instructions to the model that are prioritized ahead of user messages, following [chain of command](https://cdn.openai.com/spec/model-spec-2024-05-08.html#follow-the-chain-of-command).',
+      },
+      {
+        key: 'temperature',
+        label: 'Temperature',
+        type: 'number',
+        helpText:
+          'Higher values mean the model will take more risks. Try 0.9 for more creative applications, and 0 for ones with a well-defined answer.\n\nUse a decimal between 0 and 1.',
+      },
+      {
+        key: 'max_completion_tokens',
+        label: 'Maximum Length',
+        type: 'integer',
+        helpText: 'The maximum number of tokens for the completion.',
+      },
+    ];
+  }
+  return [];
+}
+
+async function perform(z, bundle) {
+  const {
+    user_message,
+    model,
+    files,
+    developer_message,
+    temperature,
+    max_completion_tokens,
+  } = bundle.inputData;
+
+  const developerMessage = {
+    role: 'developer',
+    content: [
+      {
+        type: 'text',
+        text: developer_message || 'You are a helpful assistant.',
+      },
+    ],
+  };
+
+  const userMessage = {
+    role: 'user',
+    content: [
+      {
+        type: 'text',
+        text: user_message,
+      },
+      ...(files
+        ? files.map((file) => ({
+            type: 'image_url',
+            image_url: {
+              url: file,
+            },
+          }))
+        : []),
+    ],
+  };
+
+  const messages = [developerMessage, userMessage];
+
+  const response = await z.request({
+    url: `${API_URL}/chat/completions`,
+    method: 'POST',
+    body: JSON.stringify({
+      model,
+      messages,
+      temperature,
+      max_completion_tokens,
+    }),
+  });
+  return response.data;
+}
+
+module.exports = {
+  key: 'chat_completion',
+  noun: 'Chat',
+  display: {
+    label: 'Chat Completion',
+    description: 'Sends a Chat to OpenAI and generates a Completion.',
+  },
+  operation: {
+    perform,
+    inputFields: [
+      {
+        key: 'info_data_usage',
+        type: 'copy',
+        helpText:
+          "Data sent to OpenAI through this Zap is via an API. Under OpenAI's [API data usage policy](https://openai.com/policies/api-data-usage-policies), OpenAI will not use API-submitted data to train or improve their models unless you explicitly decide to share your data with them for that purpose (such as by opting in). For more information, please review OpenAI's article about [when/how data may be used to improve model performance](https://help.openai.com/en/articles/5722486-how-your-data-is-used-to-improve-model-performance).",
+      },
+      {
+        key: 'user_message',
+        label: 'User Message',
+        type: 'text',
+        helpText:
+          "Instructions that request some output from the model. Similar to messages you'd type in [ChatGPT](https://chatgpt.com) as an end user.",
+        required: true,
+      },
+      {
+        key: 'files',
+        label: 'Images',
+        type: 'file',
+        helpText: 'Images to include along with your message.',
+        list: true,
+      },
+      {
+        key: 'model',
+        label: 'Model',
+        type: 'string',
+        required: true,
+        default: DEFAULT_MODEL, // Optional to default to a specific model for most users
+        dynamic: 'list_models.id.name',
+        altersDynamicFields: false,
+      },
+      {
+        key: 'show_advanced',
+        label: 'Show Advanced Options',
+        type: 'boolean',
+        default: 'false',
+        altersDynamicFields: true,
+      },
+      getAdvancedFields,
+    ],
+    // Rename some of the output fields to be more descriptive for a user
+    outputFields: [
+      { key: 'id', type: 'string', label: 'Completion ID' },
+      { key: 'model', type: 'string', label: 'Model' },
+      {
+        key: 'usage__prompt_tokens',
+        type: 'number',
+        label: 'Usage: Prompt Tokens',
+      },
+      {
+        key: 'usage__completion_tokens',
+        type: 'number',
+        label: 'Usage: Completion Tokens',
+      },
+      {
+        key: 'usage__total_tokens',
+        type: 'number',
+        label: 'Usage: Total Tokens',
+      },
+    ],
+    sample,
+  },
+};

package/src/generators/templates/openai/creates/index.js

@@ -0,0 +1,7 @@
+/* eslint-disable camelcase */
+const chat_completion = require('./chat_completion');
+
+// If you add a new create, make sure it is exported here to display in the Zapier Editor
+module.exports = {
+  [chat_completion.key]: chat_completion,
+};

package/src/generators/templates/openai/dynamic_dropdowns/index.js

@@ -0,0 +1,7 @@
+/* eslint-disable camelcase */
+const list_models = require('./list_models.js');
+
+// If you add a new Dynamic Dropdown, make sure it is exported here to display in the Zapier Editor
+module.exports = {
+  [list_models.key]: list_models,
+};

package/src/generators/templates/openai/dynamic_dropdowns/list_models.js

@@ -0,0 +1,24 @@
+const { API_URL } = require('../constants');
+
+const perform = async (z, bundle) => {
+  const response = await z.request({ url: `${API_URL}/models` });
+
+  const responseData = response.data;
+
+  return responseData.data.map((model) => ({
+    id: model.id,
+    name: model.id,
+  }));
+};
+
+module.exports = {
+  key: 'list_models',
+  noun: 'Model',
+  display: {
+    label: 'List of Models',
+    description:
+      'This is a hidden trigger, and is used in a Dynamic Dropdown of another trigger.',
+    hidden: true,
+  },
+  operation: { perform },
+};

package/src/generators/templates/openai/index.js

@@ -0,0 +1,33 @@
+/* eslint-disable camelcase */
+const authentication = require('./authentication');
+const middleware = require('./middleware');
+const dynamic_dropdowns = require('./dynamic_dropdowns');
+const creates = require('./creates');
+
+module.exports = {
+  // This is just shorthand to reference the installed dependencies you have.
+  // Zapier will need to know these before we can upload.
+  version: require('./package.json').version,
+  platformVersion: require('zapier-platform-core').version,
+
+  authentication,
+
+  beforeRequest: [...middleware.befores],
+
+  afterResponse: [...middleware.afters],
+
+  // If you want your trigger to show up, you better include it here!
+  triggers: {
+    ...dynamic_dropdowns,
+  },
+
+  // If you want your searches to show up, you better include it here!
+  searches: {},
+
+  // If you want your creates to show up, you better include it here!
+  creates: {
+    ...creates,
+  },
+
+  resources: {},
+};

package/src/generators/templates/openai/middleware.js

@@ -0,0 +1,50 @@
+/* eslint-disable camelcase */
+// This function runs after every outbound request. You can use it to check for
+// errors or modify the response. You can have as many as you need. They'll need
+// to each be registered in your index.js file.
+const handleBadResponses = (response, z, bundle) => {
+  if (response.data.error) {
+    throw new z.errors.Error(
+      response.data.error.message,
+      response.data.error.code,
+      response.status,
+    );
+  }
+
+  return response;
+};
+
+const includeOrgId = (request, z, bundle) => {
+  const { organization_id } = bundle.authData;
+  if (organization_id) {
+    request.headers['OpenAI-Organization'] = organization_id;
+  }
+  return request;
+};
+
+// This function runs before every outbound request. You can have as many as you
+// need. They'll need to each be registered in your index.js file.
+const includeApiKey = (request, z, bundle) => {
+  const { api_key } = bundle.authData;
+  if (api_key) {
+    // Use these lines to include the API key in the querystring
+    //   request.params = request.params || {};
+    //   request.params.api_key = api_key;
+
+    // If you want to include the API key in the header:
+    request.headers.Authorization = `Bearer ${api_key}`;
+  }
+
+  return request;
+};
+
+const jsonHeaders = (request) => {
+  request.headers['Content-Type'] = 'application/json';
+  request.headers.Accept = 'application/json';
+  return request;
+};
+
+module.exports = {
+  befores: [includeApiKey, includeOrgId, jsonHeaders],
+  afters: [handleBadResponses],
+};

package/src/generators/templates/openai/samples/chat.json

@@ -0,0 +1,29 @@
+{
+  "id": "chatcmpl-123",
+  "object": "chat.completion",
+  "created": 1677652288,
+  "model": "gpt-4o-mini",
+  "system_fingerprint": "fp_44709d6fcb",
+  "choices": [
+    {
+      "index": 0,
+      "message": {
+        "role": "assistant",
+        "content": "\n\nHello there, how may I assist you today?"
+      },
+      "logprobs": null,
+      "finish_reason": "stop"
+    }
+  ],
+  "service_tier": "default",
+  "usage": {
+    "prompt_tokens": 9,
+    "completion_tokens": 12,
+    "total_tokens": 21,
+    "completion_tokens_details": {
+      "reasoning_tokens": 0,
+      "accepted_prediction_tokens": 0,
+      "rejected_prediction_tokens": 0
+    }
+  }
+}

package/src/generators/templates/openai/test/authentication.test.js

@@ -0,0 +1,66 @@
+/* globals describe, it, expect */
+/* eslint-disable no-undef */
+
+const App = require('../index');
+
+describe('custom auth', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('passes authentication and returns json', async () => {
+    const bundle = {
+      authData: {
+        api_key: 'secret',
+      },
+    };
+
+    // Mock successful response
+    const mockResponse = {
+      status: 200,
+      data: {
+        email: 'test@example.com',
+      },
+    };
+
+    // Mock the request client
+    const mockRequest = jest.fn().mockResolvedValue(mockResponse);
+    const z = {
+      request: mockRequest,
+    };
+
+    const response = await App.authentication.test(z, bundle);
+
+    expect(mockRequest).toHaveBeenCalledTimes(1);
+    expect(mockRequest).toHaveBeenCalledWith({
+      url: expect.stringContaining('/me'),
+    });
+    expect(response.status).toBe(200);
+    expect(response.data).toHaveProperty('email', 'test@example.com');
+  });
+
+  it('fails on bad auth', async () => {
+    const bundle = {
+      authData: {
+        api_key: 'bad',
+      },
+    };
+
+    // Mock failed response
+    const mockRequest = jest
+      .fn()
+      .mockRejectedValue(new Error('Incorrect API key provided'));
+    const z = {
+      request: mockRequest,
+    };
+
+    try {
+      await App.authentication.test(z, bundle);
+    } catch (error) {
+      expect(mockRequest).toHaveBeenCalledTimes(1);
+      expect(error.message).toContain('Incorrect API key provided');
+      return;
+    }
+    throw new Error('appTester should have thrown');
+  });
+});

package/src/generators/templates/openai/test/chat_completion.test.js

@@ -0,0 +1,150 @@
+/* globals describe, it, expect */
+/* eslint-disable no-undef */
+
+const chatCompletion = require('../creates/chat_completion');
+const { DEFAULT_MODEL } = require('../constants');
+
+describe('chat_completion', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('creates a basic chat completion', async () => {
+    const bundle = {
+      inputData: {
+        user_message: 'Hello, how are you?',
+        model: DEFAULT_MODEL,
+      },
+    };
+
+    const mockResponse = {
+      data: {
+        id: 'chatcmpl-123',
+        model: DEFAULT_MODEL,
+        usage: {
+          prompt_tokens: 20,
+          completion_tokens: 15,
+          total_tokens: 35,
+        },
+        choices: [
+          {
+            message: {
+              content: 'I am doing well, thank you for asking!',
+            },
+          },
+        ],
+      },
+    };
+
+    const mockRequest = jest.fn().mockResolvedValue(mockResponse);
+    const z = { request: mockRequest };
+
+    const result = await chatCompletion.operation.perform(z, bundle);
+
+    expect(mockRequest).toHaveBeenCalledTimes(1);
+    expect(mockRequest).toHaveBeenCalledWith({
+      url: expect.stringContaining('/chat/completions'),
+      method: 'POST',
+      body: expect.stringContaining(bundle.inputData.user_message),
+    });
+
+    expect(result).toEqual(mockResponse.data);
+  });
+
+  it('creates a chat completion with advanced options', async () => {
+    const bundle = {
+      inputData: {
+        user_message: 'Write a story',
+        model: DEFAULT_MODEL,
+        developer_message: 'You are a creative writer',
+        temperature: 0.9,
+        max_completion_tokens: 100,
+      },
+    };
+
+    const mockResponse = {
+      data: {
+        id: 'chatcmpl-456',
+        model: DEFAULT_MODEL,
+        usage: {
+          prompt_tokens: 25,
+          completion_tokens: 50,
+          total_tokens: 75,
+        },
+      },
+    };
+
+    const mockRequest = jest.fn().mockResolvedValue(mockResponse);
+    const z = { request: mockRequest };
+
+    const result = await chatCompletion.operation.perform(z, bundle);
+
+    expect(mockRequest).toHaveBeenCalledTimes(1);
+    expect(mockRequest).toHaveBeenCalledWith({
+      url: expect.stringContaining('/chat/completions'),
+      method: 'POST',
+      body: expect.stringMatching(/temperature.*0.9/),
+    });
+
+    expect(result).toEqual(mockResponse.data);
+  });
+
+  it('creates a chat completion with image', async () => {
+    const bundle = {
+      inputData: {
+        user_message: 'Describe this image',
+        model: DEFAULT_MODEL,
+        files: ['https://example.com/image.jpg'],
+      },
+    };
+
+    const mockResponse = {
+      data: {
+        id: 'chatcmpl-789',
+        model: DEFAULT_MODEL,
+        usage: {
+          prompt_tokens: 30,
+          completion_tokens: 20,
+          total_tokens: 50,
+        },
+      },
+    };
+
+    const mockRequest = jest.fn().mockResolvedValue(mockResponse);
+    const z = { request: mockRequest };
+
+    const result = await chatCompletion.operation.perform(z, bundle);
+
+    expect(mockRequest).toHaveBeenCalledTimes(1);
+    expect(mockRequest).toHaveBeenCalledWith({
+      url: expect.stringContaining('/chat/completions'),
+      method: 'POST',
+      body: expect.stringMatching(/image_url.*example.com/),
+    });
+
+    expect(result).toEqual(mockResponse.data);
+  });
+
+  it('handles API errors', async () => {
+    const bundle = {
+      inputData: {
+        user_message: 'Hello',
+        model: DEFAULT_MODEL,
+      },
+    };
+
+    const mockRequest = jest
+      .fn()
+      .mockRejectedValue(new Error('Invalid request'));
+    const z = { request: mockRequest };
+
+    try {
+      await chatCompletion.operation.perform(z, bundle);
+    } catch (error) {
+      expect(mockRequest).toHaveBeenCalledTimes(1);
+      expect(error.message).toContain('Invalid request');
+      return;
+    }
+    throw new Error('Should have thrown an error');
+  });
+});

package/src/generators/templates/openai/test/list_models.test.js

@@ -0,0 +1,51 @@
+/* globals describe, it, expect */
+/* eslint-disable no-undef */
+
+const listModels = require('../dynamic_dropdowns/list_models');
+
+describe('list_models', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns formatted list of models', async () => {
+    const mockResponse = {
+      data: {
+        data: [{ id: 'gpt-4' }, { id: 'gpt-3.5-turbo' }],
+      },
+    };
+
+    const mockRequest = jest.fn().mockResolvedValue(mockResponse);
+    const z = { request: mockRequest };
+    const bundle = {};
+
+    const results = await listModels.operation.perform(z, bundle);
+
+    expect(mockRequest).toHaveBeenCalledTimes(1);
+    expect(mockRequest).toHaveBeenCalledWith({
+      url: expect.stringContaining('/models'),
+    });
+
+    expect(results).toEqual([
+      { id: 'gpt-4', name: 'gpt-4' },
+      { id: 'gpt-3.5-turbo', name: 'gpt-3.5-turbo' },
+    ]);
+  });
+
+  it('handles API errors', async () => {
+    const mockRequest = jest
+      .fn()
+      .mockRejectedValue(new Error('Failed to fetch models'));
+    const z = { request: mockRequest };
+    const bundle = {};
+
+    try {
+      await listModels.operation.perform(z, bundle);
+    } catch (error) {
+      expect(mockRequest).toHaveBeenCalledTimes(1);
+      expect(error.message).toContain('Failed to fetch models');
+      return;
+    }
+    throw new Error('Should have thrown an error');
+  });
+});

package/src/oclif/commands/invoke.js

@@ -259,7 +259,7 @@ const getAuthLabel = async (labelTemplate, authData, meta, zcacheTestObj) => {
   const testResult = await testAuth(authData, meta, zcacheTestObj);
   labelTemplate = labelTemplate.replace('__', '.');
   const tpl = _.template(labelTemplate, { interpolate: /{{([\s\S]+?)}}/g });
-  return tpl(testResult);
+  return tpl({ ...testResult, bundle: { authData, inputData: testResult } });
 };
 
 const getLabelForDynamicDropdown = (obj, preferredKey, fallbackKey) => {

package/src/oclif/commands/push.js

@@ -1,5 +1,6 @@
 const ZapierBaseCommand = require('../ZapierBaseCommand');
 const { BUILD_PATH, SOURCE_PATH } = require('../../constants');
+const { Flags } = require('@oclif/core');
 
 const BuildCommand = require('./build');
 
@@ -13,6 +14,7 @@ class PushCommand extends ZapierBaseCommand {
         skipNpmInstall: this.flags['skip-npm-install'],
         disableDependencyDetection: this.flags['disable-dependency-detection'],
         skipValidation: this.flags['skip-validation'],
+        overwritePartnerChanges: this.flags['overwrite-partner-changes'],
       },
     );
     this.log(
@@ -21,7 +23,14 @@ class PushCommand extends ZapierBaseCommand {
   }
 }
 
-PushCommand.flags = BuildCommand.flags;
+PushCommand.flags = {
+  ...BuildCommand.flags,
+  'overwrite-partner-changes': Flags.boolean({
+    description:
+      '(Internal Use Only) Allows Zapier Staff to push changes to integrations in certain situations.',
+    hidden: true,
+  }),
+};
 PushCommand.description = `Build and upload the current integration.
 
 This command is the same as running \`zapier build\` and \`zapier upload\` in sequence. See those for more info.`;

package/src/utils/api.js

@@ -422,7 +422,10 @@ const downloadSourceZip = async (dst) => {
   }
 };
 
-const upload = async (app, { skipValidation = false } = {}) => {
+const upload = async (
+  app,
+  { skipValidation = false, overwritePartnerChanges = false } = {},
+) => {
   const zipPath = constants.BUILD_PATH;
   const sourceZipPath = constants.SOURCE_PATH;
   const appDir = process.cwd();
@@ -449,17 +452,42 @@ const upload = async (app, { skipValidation = false } = {}) => {
   const binarySourceZip = fs.readFileSync(fullSourceZipPath);
   const sourceBuffer = Buffer.from(binarySourceZip).toString('base64');
 
+  const headers = {};
+  if (overwritePartnerChanges) {
+    headers['X-Overwrite-Partner-Changes'] = 'true';
+  }
+
   startSpinner(`Uploading version ${definition.version}`);
-  await callAPI(`/apps/${app.id}/versions/${definition.version}`, {
-    method: 'PUT',
-    body: {
-      zip_file: buffer,
-      source_zip_file: sourceBuffer,
-      skip_validation: skipValidation,
-    },
-  });
+  try {
+    await callAPI(
+      `/apps/${app.id}/versions/${definition.version}`,
+      {
+        method: 'PUT',
+        body: {
+          zip_file: buffer,
+          source_zip_file: sourceBuffer,
+          skip_validation: skipValidation,
+        },
+        extraHeaders: headers,
+      },
+      true,
+    );
+  } catch (err) {
+    endSpinner({ success: false });
+    // 409 from the backend specifically signals that the last changes were from a partner
+    // and this is a staff user which could unintentionally overwrite those changes
+    if (err.status === 409) {
+      throw new Error(
+        `The latest integration changes appear to be from a partner. OK to overwrite?` +
+          ` If so, run this command again using the '--overwrite-partner-changes' flag.`,
+      );
+    }
 
-  endSpinner();
+    // Don't ignore other errors, re-throw them with a user-friendly message
+    throw new Error(err.errText);
+  } finally {
+    endSpinner();
+  }
 };
 
 module.exports = {