Skip to content

Commit 9e10f5d

Browse files
committed
add more snippets and use top-level of messages package for dependencies
1 parent c1111ae commit 9e10f5d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+167
-161
lines changed

messages/messenger/send-audio.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,25 @@
88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
VONAGE_FB_SENDER_ID = os.environ.get("VONAGE_FB_SENDER_ID")
12-
FB_RECIPIENT_ID = os.environ.get("FB_RECIPIENT_ID")
13-
AUDIO_URL = os.environ.get("AUDIO_URL")
11+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
12+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
13+
MESSAGES_AUDIO_URL = os.environ.get("MESSAGES_AUDIO_URL")
1414

15-
from vonage import Auth, Vonage
16-
from vonage_messages.models import MessengerAudio, MessengerResource
15+
from vonage import Auth, HttpClientOptions, Vonage
16+
from vonage_messages import MessengerAudio, MessengerResource
1717

1818
client = Vonage(
1919
Auth(
2020
application_id=VONAGE_APPLICATION_ID,
2121
private_key=VONAGE_PRIVATE_KEY,
22-
)
22+
),
23+
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
2324
)
2425

2526
message = MessengerAudio(
26-
to=FB_RECIPIENT_ID,
27-
from_=VONAGE_FB_SENDER_ID,
28-
audio=MessengerResource(url=AUDIO_URL),
27+
to=MESSENGER_RECIPIENT_ID,
28+
from_=MESSENGER_SENDER_ID,
29+
audio=MessengerResource(url=MESSAGES_AUDIO_URL),
2930
)
3031

3132
response = client.messages.send(message)

messages/messenger/send-file.py

+10-9
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,25 @@
88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
VONAGE_FB_SENDER_ID = os.environ.get("VONAGE_FB_SENDER_ID")
12-
FB_RECIPIENT_ID = os.environ.get("FB_RECIPIENT_ID")
13-
FILE_URL = os.environ.get("FILE_URL")
11+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
12+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
13+
MESSAGES_FILE_URL = os.environ.get("MESSAGES_FILE_URL")
1414

15-
from vonage import Auth, Vonage
16-
from vonage_messages.models import MessengerFile, MessengerResource
15+
from vonage import Auth, HttpClientOptions, Vonage
16+
from vonage_messages import MessengerFile, MessengerResource
1717

1818
client = Vonage(
1919
Auth(
2020
application_id=VONAGE_APPLICATION_ID,
2121
private_key=VONAGE_PRIVATE_KEY,
22-
)
22+
),
23+
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
2324
)
2425

2526
message = MessengerFile(
26-
to=FB_RECIPIENT_ID,
27-
from_=VONAGE_FB_SENDER_ID,
28-
file=MessengerResource(url=FILE_URL),
27+
to=MESSENGER_RECIPIENT_ID,
28+
from_=MESSENGER_SENDER_ID,
29+
file=MessengerResource(url=MESSAGES_FILE_URL),
2930
)
3031

3132
response = client.messages.send(message)

messages/messenger/send-image.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
VONAGE_PRIVATE_KEY
11-
VONAGE_FB_SENDER_ID = os.environ.get("VONAGE_FB_SENDER_ID")
12-
FB_RECIPIENT_ID = os.environ.get("FB_RECIPIENT_ID")
13-
IMAGE_URL = os.environ.get("IMAGE_URL")
10+
11+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
12+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
13+
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
1414

1515
from vonage import Auth, Vonage
16-
from vonage_messages.models import MessengerImage, MessengerResource
16+
from vonage_messages import MessengerImage, MessengerResource
1717

1818
client = Vonage(
1919
Auth(
2020
application_id=VONAGE_APPLICATION_ID,
2121
private_key=VONAGE_PRIVATE_KEY,
2222
)
23-
)VONAGE_PRIVATE_KEY
23+
)
2424

2525
message = MessengerImage(
26-
to=FB_RECIPIENT_ID,
27-
from_=VONAGE_FB_SENDER_ID,
28-
image=MessengerResource(url=IMAGE_URL),
26+
to=MESSENGER_RECIPIENT_ID,
27+
from_=MESSENGER_SENDER_ID,
28+
image=MessengerResource(url=MESSAGES_IMAGE_URL),
2929
)
3030

3131
response = client.messages.send(message)

messages/messenger/send-text.py

+12-9
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
1010

11-
VONAGE_FB_SENDER_ID = os.environ.get("VONAGE_FB_SENDER_ID")
12-
FB_RECIPIENT_ID = os.environ.get("FB_RECIPIENT_ID")
11+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
12+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
1313

14-
from vonage import Auth, Vonage
15-
from vonage_messages.models import MessengerText
14+
from vonage import Auth, HttpClientOptions, Vonage
15+
from vonage_messages import MessengerText
1616

1717
client = Vonage(
1818
Auth(
@@ -22,10 +22,13 @@
2222
)
2323

2424
message = MessengerText(
25-
to=FB_RECIPIENT_ID,
26-
from_=VONAGE_FB_SENDER_ID,
25+
to=MESSENGER_RECIPIENT_ID,
26+
from_=MESSENGER_SENDER_ID,
2727
text='Hello from the Vonage Messages API.',
2828
)
29-
30-
response = client.messages.send(message)
31-
print(response)
29+
try:
30+
response = client.messages.send(message)
31+
print(response)
32+
except Exception as e:
33+
print(e)
34+
print(client.http_client.last_request.url)

messages/messenger/send-video.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77

88
VONAGE_APPLICATION_ID = os.environ.get("VONAGE_APPLICATION_ID")
99
VONAGE_PRIVATE_KEY = os.environ.get("VONAGE_PRIVATE_KEY")
10-
VONAGE_PRIVATE_KEY
11-
VONAGE_FB_SENDER_ID = os.environ.get("VONAGE_FB_SENDER_ID")
12-
FB_RECIPIENT_ID = os.environ.get("FB_RECIPIENT_ID")
13-
VIDEO_URL = os.environ.get("VIDEO_URL")
10+
MESSENGER_RECIPIENT_ID = os.environ.get("MESSENGER_RECIPIENT_ID")
11+
MESSENGER_SENDER_ID = os.environ.get("MESSENGER_SENDER_ID")
12+
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
1413

15-
from vonage import Auth, Vonage
16-
from vonage_messages.models import MessengerVideo, MessengerResource
14+
from vonage import Auth, HttpClientOptions, Vonage
15+
from vonage_messages import MessengerVideo, MessengerResource
1716

1817
client = Vonage(
1918
Auth(
2019
application_id=VONAGE_APPLICATION_ID,
21-
private_key=VONAGE_PRIVATE_KEY_PATH,
22-
)
23-
)VONAGE_PRIVATE_KEY
20+
private_key=VONAGE_PRIVATE_KEY,
21+
),
22+
http_client_options=HttpClientOptions(api_host='messages-sandbox.nexmo.com'),
23+
)
2424

2525
message = MessengerVideo(
26-
to=FB_RECIPIENT_ID,
27-
from_=VONAGE_FB_SENDER_ID,
28-
video=MessengerResource(url=VIDEO_URL),
26+
to=MESSENGER_RECIPIENT_ID,
27+
from_=MESSENGER_SENDER_ID,
28+
video=MessengerResource(url=MESSAGES_VIDEO_URL),
2929
)
3030

3131
response = client.messages.send(message)

messages/mms/send-audio.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_AUDIO_URL = os.environ.get("MESSAGES_AUDIO_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import MmsAudio, MmsResource
15+
from vonage_messages import MmsAudio, MmsResource
1616

1717
client = Vonage(
1818
Auth(

messages/mms/send-image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import MmsImage, MmsResource
15+
from vonage_messages import MmsImage, MmsResource
1616

1717
client = Vonage(
1818
Auth(

messages/mms/send-vcard.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_VCARD_URL = os.environ.get("MESSAGES_VCARD_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import MmsVcard, MmsResource
15+
from vonage_messages import MmsVcard, MmsResource
1616

1717
client = Vonage(
1818
Auth(

messages/mms/send-video.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import MmsVideo, MmsResource
15+
from vonage_messages import MmsVideo, MmsResource
1616

1717
client = Vonage(
1818
Auth(

messages/rcs/send-file.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_FILE_URL = os.environ.get("MESSAGES_FILE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import RcsFile, RcsResource
15+
from vonage_messages import RcsFile, RcsResource
1616

1717
client = Vonage(
1818
Auth(

messages/rcs/send-image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import RcsImage, RcsResource
15+
from vonage_messages import RcsImage, RcsResource
1616

1717
client = Vonage(
1818
Auth(

messages/rcs/send-rich-card-carousel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
1414

1515
from vonage import Auth, Vonage
16-
from vonage_messages.models import RcsCustom
16+
from vonage_messages import RcsCustom
1717

1818
client = Vonage(
1919
Auth(

messages/rcs/send-rich-card-standalone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_IMAGE_URL = os.environ.get("MESSAGES_IMAGE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import RcsCustom
15+
from vonage_messages import RcsCustom
1616

1717
client = Vonage(
1818
Auth(

messages/rcs/send-suggested-action-create-calendar-event.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-action-dial.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-action-multiple.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-action-open-url.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-action-share-location.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-action-view-location.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-suggested-reply.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsCustom
14+
from vonage_messages import RcsCustom
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
RCS_SENDER_ID = os.environ.get("RCS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import RcsText
14+
from vonage_messages import RcsText
1515

1616
client = Vonage(
1717
Auth(

messages/rcs/send-video.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
MESSAGES_VIDEO_URL = os.environ.get("MESSAGES_VIDEO_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import RcsVideo, RcsResource
15+
from vonage_messages import RcsVideo, RcsResource
1616

1717
client = Vonage(
1818
Auth(

messages/sandbox/messenger/send_text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616

1717
from vonage import Auth, HttpClientOptions, Vonage
18-
from vonage_messages.models import MessengerText
18+
from vonage_messages import MessengerText
1919

2020
client = Vonage(
2121
auth=Auth(

messages/sandbox/viber/send_text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616

1717
from vonage import Auth, HttpClientOptions, Vonage
18-
from vonage_messages.models import ViberText
18+
from vonage_messages import ViberText
1919

2020
client = Vonage(
2121
auth=Auth(

messages/sandbox/whatsapp/send_text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616

1717
from vonage import Auth, HttpClientOptions, Vonage
18-
from vonage_messages.models import WhatsappText
18+
from vonage_messages import WhatsappText
1919

2020
client = Vonage(
2121
auth=Auth(

messages/sms/send-sms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
SMS_SENDER_ID = os.environ.get("SMS_SENDER_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import Sms
14+
from vonage_messages import Sms
1515

1616
client = Vonage(
1717
Auth(

messages/viber/send-file.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
FILE_URL = os.environ.get("FILE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import ViberFile, ViberFileResource
15+
from vonage_messages import ViberFile, ViberFileResource
1616

1717
client = Vonage(
1818
Auth(

messages/viber/send-image.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
IMAGE_URL = os.environ.get("IMAGE_URL")
1313

1414
from vonage import Auth, Vonage
15-
from vonage_messages.models import ViberImage, ViberImageResource
15+
from vonage_messages import ViberImage, ViberImageResource
1616

1717
client = Vonage(
1818
Auth(

messages/viber/send-text.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
VIBER_SERVICE_MESSAGE_ID = os.environ.get("VIBER_SERVICE_MESSAGE_ID")
1212

1313
from vonage import Auth, Vonage
14-
from vonage_messages.models import ViberText
14+
from vonage_messages import ViberText
1515

1616
client = Vonage(
1717
Auth(

0 commit comments

Comments
 (0)