Skip to content

Commit 68d8275

Browse files
committed
Merge branch 'main' into jsklan/python-sdk
2 parents 534b002 + 74562e2 commit 68d8275

File tree

7 files changed

+243
-226
lines changed

7 files changed

+243
-226
lines changed

.github/workflows/ts-sdk.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,26 @@ on:
44
workflow_dispatch:
55
inputs:
66
version:
7-
description: 'The version of the SDKs that you would like to release'
7+
description: "The version of the SDKs that you would like to release"
88
required: true
99
type: string
10-
push:
11-
branches:
12-
- main
13-
paths:
14-
- 'fern/**'
1510

1611
jobs:
1712
release:
1813
runs-on: ubuntu-latest
1914
steps:
2015
- name: Checkout repo
2116
uses: actions/checkout@v3
22-
with:
23-
fetch-depth: 0
2417

2518
- name: Setup node
2619
uses: actions/setup-node@v4
2720

2821
- name: Download Fern
2922
run: npm install -g fern-api
3023

31-
- name: Determine version
32-
id: bump
33-
run: |
34-
if [ -n "${{ inputs.version }}" ]; then
35-
echo "version=${{ inputs.version }}" >> $GITHUB_OUTPUT
36-
else
37-
chmod +x ./scripts/fern/bump.sh
38-
VERSION=$(./scripts/fern/bump.sh --from HEAD~1 --group ts-sdk)
39-
echo "version=$VERSION" >> $GITHUB_OUTPUT
40-
fi
41-
4224
- name: Release SDKs
4325
env:
4426
FERN_TOKEN: ${{ secrets.FERN_TOKEN }}
4527
FERN_NPM_TOKEN: ${{ secrets.FERN_NPM_TOKEN }}
4628
run: |
47-
echo "Releasing SDK version: ${{ steps.bump.outputs.version }}"
48-
fern generate --group ts-sdk --version ${{ steps.bump.outputs.version }} --log-level debug
29+
fern generate --group ts-sdk --version ${{ inputs.version }} --log-level debug

descriptions/0/api.intercom.io.yaml

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9223,7 +9223,7 @@ paths:
92239223
- Messages
92249224
operationId: createMessage
92259225
description: "You can create a message that has been initiated by an admin.
9226-
The conversation can be either an in-app message, an email or sms.\n\n> \U0001F6A7
9226+
The conversation can be either an in-app message, an email, sms or whatsapp.\n\n> \U0001F6A7
92279227
Sending for visitors\n>\n> There can be a short delay between when a contact
92289228
is created and when a contact becomes available to be messaged through the
92299229
API. A 404 Not Found error will be returned in this case.\n\nThis will return
@@ -9396,6 +9396,23 @@ paths:
93969396
id: 6762f23a1bb69f9f2193bc1a
93979397
message_type: sms
93989398
body: heyy
9399+
admin_whatsapp_message_created:
9400+
summary: admin whatsapp message created
9401+
value:
9402+
from:
9403+
type: admin
9404+
id: '991267817'
9405+
to:
9406+
phone: +5547999998888
9407+
name: John Doe
9408+
message_type: whatsapp
9409+
components:
9410+
- type: BODY
9411+
parameters:
9412+
- type: text
9413+
text: Username 123
9414+
template: keep_live
9415+
locale: en
93999416
no_body_supplied_for_message:
94009417
summary: No body supplied for message
94019418
value:
@@ -16874,10 +16891,12 @@ components:
1687416891
properties:
1687516892
message_type:
1687616893
type: string
16877-
description: 'The kind of message being created. Values: `in_app` or `email`.'
16894+
description: 'The kind of message being created. Values: `in_app`, `email`, `sms` or `whatsapp`.'
1687816895
enum:
1687916896
- in_app
1688016897
- email
16898+
- sms
16899+
- whatsapp
1688116900
example: in_app
1688216901
subject:
1688316902
type: string
@@ -16974,6 +16993,13 @@ components:
1697416993
- body
1697516994
- from
1697616995
- to
16996+
- title: 'message_type: `whatsapp`.'
16997+
required:
16998+
- message_type
16999+
- template
17000+
- components
17001+
- from
17002+
- to
1697717003
recipient:
1697817004
type: object
1697917005
title: Recipient
@@ -18049,8 +18075,6 @@ components:
1804918075
required:
1805018076
- type
1805118077
- external_id
18052-
- name
18053-
- email
1805418078
properties:
1805518079
type:
1805618080
type: string
@@ -18061,11 +18085,11 @@ components:
1806118085
description: External identifier for the contact. Intercom will take care of the mapping of your external_id with our internal ones so you don't have to worry about it.
1806218086
name:
1806318087
type: string
18064-
description: Name of the contact.
18088+
description: Name of the contact. Required for user type.
1806518089
email:
1806618090
type: string
1806718091
format: email
18068-
description: Email address of the contact.
18092+
description: Email address of the contact. Required for user type.
1806918093
custom_channel_notification_response:
1807018094
type: object
1807118095
required:
@@ -18719,8 +18743,9 @@ components:
1871918743
- facebook
1872018744
- twitter
1872118745
- sms
18722-
description: The type of message that was sent. Can be email, inapp, facebook
18723-
,twitter or sms.
18746+
- whatsapp
18747+
description: The type of message that was sent. Can be email, inapp, facebook,
18748+
twitter, sms or whatsapp.
1872418749
example: inapp
1872518750
conversation_id:
1872618751
type: string

fern/fern.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"organization": "intercom",
3-
"version": "0.64.15"
3+
"version": "0.63.25"
44
}

fern/generators.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1+
# yaml-language-server: $schema=https://schema.buildwithfern.dev/generators-yml.json
12
api:
23
specs:
34
- openapi: ../descriptions/2.11/api.intercom.io.yaml
45
overrides: ./openapi-overrides.yml
56
settings:
67
title-as-schema-name: false
78
inline-path-parameters: true
9+
- openapi: ../descriptions/0/api.intercom.io.yaml
10+
overrides: ./unstable-openapi-overrides.yml
11+
namespace: unstable
12+
settings:
13+
title-as-schema-name: false
14+
inline-path-parameters: true
815
groups:
916
ts-sdk:
1017
generators:
1118
- name: fernapi/fern-typescript-node-sdk
12-
version: 0.49.3
19+
version: 0.51.7
1320
output:
1421
location: npm
1522
package-name: intercom-client
@@ -39,7 +46,7 @@ groups:
3946
java-sdk:
4047
generators:
4148
- name: fernapi/fern-java-sdk
42-
version: 2.32.8
49+
version: 2.37.0
4350
output:
4451
location: maven
4552
coordinate: io.intercom:intercom-java

fern/openapi-overrides.yml

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -442,30 +442,6 @@ paths:
442442
- conversations
443443
x-fern-sdk-method-name: redactConversationPart
444444
x-fern-request-name: RedactConversationPartRequest
445-
/custom_channel_events/notify_attribute_collected:
446-
post:
447-
x-fern-sdk-group-name:
448-
- customChannelEvents
449-
x-fern-sdk-method-name: notifyAttributeCollected
450-
x-fern-request-name: NotifyAttributeCollectedRequest
451-
/custom_channel_events/notify_new_message:
452-
post:
453-
x-fern-sdk-group-name:
454-
- customChannelEvents
455-
x-fern-sdk-method-name: notifyNewMessage
456-
x-fern-request-name: NotifyNewMessageRequest
457-
/custom_channel_events/notify_new_conversation:
458-
post:
459-
x-fern-sdk-group-name:
460-
- customChannelEvents
461-
x-fern-sdk-method-name: notifyNewConversation
462-
x-fern-request-name: NotifyNewConversationRequest
463-
/custom_channel_events/notify_quick_reply_selected:
464-
post:
465-
x-fern-sdk-group-name:
466-
- customChannelEvents
467-
x-fern-sdk-method-name: notifyQuickReplySelected
468-
x-fern-request-name: NotifyQuickReplySelectedRequest
469445
/data_attributes:
470446
get:
471447
x-fern-sdk-group-name:
@@ -1452,6 +1428,11 @@ components:
14521428
type:
14531429
enum:
14541430
- tag
1431+
# The spec incorrectly labels applied_at and applied_by as required
1432+
required:
1433+
- type
1434+
- id
1435+
- name
14551436
ticket_custom_attributes:
14561437
x-fern-type: map<string, unknown>
14571438
ticket_request_custom_attributes:
@@ -1503,6 +1484,17 @@ components:
15031484
properties:
15041485
custom_attributes:
15051486
additionalProperties: true
1487+
# The spec incorrectly labels last_request_at, remote_created_at, size, website, and industry as required
1488+
required:
1489+
- company_id
1490+
- id
1491+
- app_id
1492+
- name
1493+
- created_at
1494+
- updated_at
1495+
- monthly_spend
1496+
- session_count
1497+
- user_count
15061498
create_or_update_company_request:
15071499
properties:
15081500
custom_attributes:
@@ -1551,7 +1543,65 @@ components:
15511543
note_list:
15521544
properties:
15531545
pages:
1554-
"$ref": "#/components/schemas/offset_pages"
1546+
# The spec incorrectly labels job_title as required
1547+
admin:
1548+
required:
1549+
- id
1550+
- name
1551+
- email
1552+
- away_mode_enabled
1553+
- away_mode_reassign
1554+
- has_inbox_seat
1555+
- team_ids
1556+
# The spec incorrectly labels default_locale and translated_content as required
1557+
article_list_item:
1558+
required:
1559+
- id
1560+
- workspace_id
1561+
- title
1562+
- description
1563+
- body
1564+
- author_id
1565+
- state
1566+
- created_at
1567+
- updated_at
1568+
- url
1569+
- parent_id
1570+
- parent_type
1571+
- statistics
1572+
1573+
# The spec incorrectly labels conversions as required
1574+
article_statistics:
1575+
required:
1576+
- type
1577+
- views
1578+
- reactions
1579+
- happy_reaction_percentage
1580+
- neutral_reaction_percentage
1581+
- sad_reaction_percentage
1582+
1583+
# The spec incorrectly labels description as required
1584+
data_attribute:
1585+
required:
1586+
- type
1587+
- name
1588+
- full_name
1589+
- label
1590+
- data_type
1591+
1592+
# The spec incorrectly labels type, email, intercom_user_id, and user_id as required
1593+
data_event_summary:
1594+
required:
1595+
- events
1596+
1597+
# The spec incorrectly labels default_locale as required
1598+
collection:
1599+
required:
1600+
- id
1601+
- workspace_id
1602+
- name
1603+
- created_at
1604+
- order
15551605

15561606
securitySchemes:
15571607
bearerAuth:

0 commit comments

Comments
 (0)