Skip to content

Commit f497848

Browse files
apaparazzi0329apaparazzi0329
authored
Major release 2022 (#1065)
* feat(assistantv1): add three new response types and remove properties BREAKING CHANGE: OutputData: required text property removed, RuntimeEntity: optional metadata property removed RuntimeResponseGeneric: Three new response types added Workspace: workspaceID changed form required to optional * feat(assistantv2): add three new response types, rename file, remove properties and hand edits BREAKING CHANGE: RuntimeEntity: optional metadata property removed, MessageOutputDebug: nodesVisited type DialogNodesVisited changed to DialogNodeVisited. MessageContext: integrations property added MessageContextGlobalSystem: skipUserInput property added MessageContextStateless: integrations property added MessageInput: attachments property added MessageInputStateless: attachments property added RuntimeResponseGeneric: Three new response types added * refactor(cc): remove compare and comply ヾ(･‿･) * refactor(nlc): remove nlc ヾ(･‿･) * docs(nlu): updates on a few comments * refactor(pi): remove personality insights ヾ(･‿･) * feat(stt/tts): add new property and comment changes * refactor(ta/visrec): remove ta and visrec ヾ(･‿･) * refactor(all): remove remaining traces of removed services * refactor(assistant): fix copyrights * feat(discov1): change required properties to optional * feat(assistantv1): add new dialogNode models and additional properties for Workspace * feat(stt): change grammarFile property type BREAKING CHANGE: addGrammar parameter grammarFile changed from String to Data type SupportedFeatures: customAcousticModel property added * feat(discov1): update QueryAggregation subclasses BREAKING CHANGE: QueryAggregation: QueryAggregation subclasses changed. DocumentStatus: documentID, status, and statusDescription are now optional * build(xcode): pbxproj updates * build(packages): update to swift-core 1.2.1 and remove old frameworks * build(deprecate): remove further traces of deprecated services * build(secrets): upload secrets baseline * docs(readme): add deprecation note and remove old references
1 parent 0056ea8 commit f497848

File tree

354 files changed

+4637
-23919
lines changed

Some content is hidden

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

354 files changed

+4637
-23919
lines changed

‎.bumpversion.cfg

-24
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,30 @@ message = Release version {new_version} [skip ci]
1111

1212
[bumpversion:file:IBMWatsonAssistantV2.podspec]
1313

14-
[bumpversion:file:IBMWatsonCompareComplyV1.podspec]
15-
1614
[bumpversion:file:IBMWatsonDiscoveryV1.podspec]
1715

1816
[bumpversion:file:IBMWatsonDiscoveryV2.podspec]
1917

2018
[bumpversion:file:IBMWatsonLanguageTranslatorV3.podspec]
2119

22-
[bumpversion:file:IBMWatsonNaturalLanguageClassifierV1.podspec]
23-
2420
[bumpversion:file:IBMWatsonNaturalLanguageUnderstandingV1.podspec]
2521

26-
[bumpversion:file:IBMWatsonPersonalityInsightsV3.podspec]
27-
2822
[bumpversion:file:IBMWatsonSpeechToTextV1.podspec]
2923

3024
[bumpversion:file:IBMWatsonTextToSpeechV1.podspec]
3125

32-
[bumpversion:file:IBMWatsonToneAnalyzerV3.podspec]
33-
34-
[bumpversion:file:IBMWatsonVisualRecognitionV3.podspec]
35-
36-
[bumpversion:file:IBMWatsonVisualRecognitionV4.podspec]
37-
3826
[bumpversion:file:Scripts/jazzy-config/AssistantV1.jazzy.yaml]
3927

4028
[bumpversion:file:Scripts/jazzy-config/AssistantV2.jazzy.yaml]
4129

42-
[bumpversion:file:Scripts/jazzy-config/CompareComplyV1.jazzy.yaml]
43-
4430
[bumpversion:file:Scripts/jazzy-config/DiscoveryV1.jazzy.yaml]
4531

4632
[bumpversion:file:Scripts/jazzy-config/DiscoveryV2.jazzy.yaml]
4733

4834
[bumpversion:file:Scripts/jazzy-config/LanguageTranslatorV3.jazzy.yaml]
4935

50-
[bumpversion:file:Scripts/jazzy-config/NaturalLanguageClassifierV1.jazzy.yaml]
51-
5236
[bumpversion:file:Scripts/jazzy-config/NaturalLanguageUnderstandingV1.jazzy.yaml]
5337

54-
[bumpversion:file:Scripts/jazzy-config/PersonalityInsightsV3.jazzy.yaml]
55-
5638
[bumpversion:file:Scripts/jazzy-config/SpeechToTextV1.jazzy.yaml]
5739

5840
[bumpversion:file:Scripts/jazzy-config/TextToSpeechV1.jazzy.yaml]
59-
60-
[bumpversion:file:Scripts/jazzy-config/ToneAnalyzerV3.jazzy.yaml]
61-
62-
[bumpversion:file:Scripts/jazzy-config/VisualRecognitionV3.jazzy.yaml]
63-
64-
[bumpversion:file:Scripts/jazzy-config/VisualRecognitionV4.jazzy.yaml]

‎.github/workflows/integration-test.yml

+50-60
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,68 @@
66
name: Run Integration Tests
77

88
on:
9-
109
# Allows you to run this workflow manually from the Actions tab
1110
workflow_dispatch:
1211

1312
jobs:
1413
integration_test:
15-
1614
name: Build and Run Integration Tests on Swift ${{ matrix.os }}
1715
runs-on: ${{ matrix.os }}
1816
strategy:
1917
matrix:
2018
os: [macos-latest]
2119

2220
steps:
23-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v2
2422

25-
- uses: maxim-lobanov/setup-xcode@v1
26-
with:
27-
xcode-version: '12.5'
23+
- uses: maxim-lobanov/setup-xcode@v1
24+
with:
25+
xcode-version: "12.5"
2826

29-
- name: Display versions
30-
run: |
31-
swift --version
32-
xcodebuild -version
33-
ls /Applications | grep Xcode
27+
- name: Display versions
28+
run: |
29+
swift --version
30+
xcodebuild -version
31+
ls /Applications | grep Xcode
3432
35-
- name: Execute Swift integration tests
36-
# continue-on-error: true
37-
env:
38-
NATURAL_LANGUAGE_CLASSIFIER_APIKEY: ${{ secrets.NLC_APIKEY }}
39-
NATURAL_LANGUAGE_CLASSIFIER_URL: "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com"
40-
LANGUAGE_TRANSLATOR_APIKEY: ${{ secrets.LT_APIKEY }}
41-
LANGUAGE_TRANSLATOR_URL: "https://api.us-south.language-translator.watson.cloud.ibm.com"
42-
NATURAL_LANGUAGE_UNDERSTANDING_APIKEY: ${{ secrets.NLU_APIKEY }}
43-
NATURAL_LANGUAGE_UNDERSTANDING_URL: "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com"
44-
TONE_ANALYZER_APIKEY: ${{ secrets.TA_APIKEY }}
45-
TONE_ANALYZER_URL: "https://api.us-south.tone-analyzer.watson.cloud.ibm.com"
46-
SPEECH_TO_TEXT_APIKEY: ${{ secrets.STT_APIKEY }}
47-
SPEECH_TO_TEXT_URL: "https://api.us-south.speech-to-text.watson.cloud.ibm.com"
48-
TEXT_TO_SPEECH_APIKEY: ${{ secrets.TTS_APIKEY }}
49-
TEXT_TO_SPEECH_URL: "https://api.us-south.text-to-speech.watson.cloud.ibm.com"
50-
ASSISTANT_APIKEY: ${{ secrets.WA_APIKEY }}
51-
ASSISTANT_WORKSPACE_ID: ${{ secrets.WA_WORKSPACE_ID }}
52-
ASSISTANT_ASSISTANT_ID: ${{ secrets.WA_ASSISTANT_ID }}
53-
ASSISTANT_URL: "https://api.us-south.assistant.watson.cloud.ibm.com"
54-
DISCOVERY_APIKEY: ${{ secrets.D1_APIKEY }}
55-
DISCOVERY_ENVIRONMENT_ID: ${{ secrets.D1_ENVIRONMENT_ID }}
56-
DISCOVERY_COLLECTION_ID: ${{ secrets.D1_COLLECTION_ID }}
57-
DISCOVERY_URL: "https://api.us-south.discovery.watson.cloud.ibm.com"
58-
DISCOVERY_V2_APIKEY: ${{ secrets.D2_APIKEY }}
59-
DISCOVERY_V2_PROJECT_ID: ${{ secrets.D2_PROJECT_ID }}
60-
DISCOVERY_V2_COLLECTION_ID: ${{ secrets.D2_COLLECTION_ID }}
61-
DISCOVERY_V2_URL: "https://api.us-south.discovery.watson.cloud.ibm.com"
62-
run: |
63-
cp Sources/SupportingFiles/WatsonCredentialsGHA.swift Sources/SupportingFiles/WatsonCredentials.swift
64-
echo -e "\n\033[0;35mCommand: Run AssistantV1 Integration tests"
65-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme AssistantV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "AssistantV1Tests/AssistantTests" | xcpretty
66-
echo -e "\n\033[0;35mCommand: Run AssistantV2 Integration tests"
67-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme AssistantV2 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
68-
echo -e "\n\033[0;35mCommand: Run DiscoveryV1 Integration tests"
69-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme DiscoveryV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "DiscoveryV1Tests/DiscoveryTests" | xcpretty
70-
echo -e "\n\033[0;35mCommand: Run DiscoveryV2 Integration tests"
71-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme DiscoveryV2 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "DiscoveryV2Tests/DiscoveryV2Tests" | xcpretty
72-
echo -e "\n\033[0;35mCommand: Run LanguageTranslatorV3 Integration tests"
73-
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme LanguageTranslatorV3 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
74-
echo -e "\n\033[0;35mCommand: Run NaturalLanguageClassifierV1 Integration tests"
75-
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme NaturalLanguageClassifierV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
76-
echo -e "\n\033[0;35mCommand: Run NaturalLanguageUnderstandingV1 Integration tests"
77-
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme NaturalLanguageUnderstandingV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
78-
echo -e "\n\033[0;35mCommand: Run SpeechToTextV1 Integration tests"
79-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme SpeechToTextV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "SpeechToTextV1Tests/SpeechToTextTests" | xcpretty
80-
echo -e "\n\033[0;35mCommand: Run TextToSpeechV1 Integration tests"
81-
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme TextToSpeechV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
82-
echo -e "\n\033[0;35mCommand: Run ToneAnalyzerV3 Integration tests"
83-
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme ToneAnalyzerV3 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
33+
- name: Execute Swift integration tests
34+
# continue-on-error: true
35+
env:
36+
LANGUAGE_TRANSLATOR_APIKEY: ${{ secrets.LT_APIKEY }}
37+
LANGUAGE_TRANSLATOR_URL: "https://api.us-south.language-translator.watson.cloud.ibm.com"
38+
NATURAL_LANGUAGE_UNDERSTANDING_APIKEY: ${{ secrets.NLU_APIKEY }}
39+
NATURAL_LANGUAGE_UNDERSTANDING_URL: "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com"
40+
SPEECH_TO_TEXT_APIKEY: ${{ secrets.STT_APIKEY }}
41+
SPEECH_TO_TEXT_URL: "https://api.us-south.speech-to-text.watson.cloud.ibm.com"
42+
TEXT_TO_SPEECH_APIKEY: ${{ secrets.TTS_APIKEY }}
43+
TEXT_TO_SPEECH_URL: "https://api.us-south.text-to-speech.watson.cloud.ibm.com"
44+
ASSISTANT_APIKEY: ${{ secrets.WA_APIKEY }}
45+
ASSISTANT_WORKSPACE_ID: ${{ secrets.WA_WORKSPACE_ID }}
46+
ASSISTANT_ASSISTANT_ID: ${{ secrets.WA_ASSISTANT_ID }}
47+
ASSISTANT_URL: "https://api.us-south.assistant.watson.cloud.ibm.com"
48+
DISCOVERY_APIKEY: ${{ secrets.D1_APIKEY }}
49+
DISCOVERY_ENVIRONMENT_ID: ${{ secrets.D1_ENVIRONMENT_ID }}
50+
DISCOVERY_COLLECTION_ID: ${{ secrets.D1_COLLECTION_ID }}
51+
DISCOVERY_URL: "https://api.us-south.discovery.watson.cloud.ibm.com"
52+
DISCOVERY_V2_APIKEY: ${{ secrets.D2_APIKEY }}
53+
DISCOVERY_V2_PROJECT_ID: ${{ secrets.D2_PROJECT_ID }}
54+
DISCOVERY_V2_COLLECTION_ID: ${{ secrets.D2_COLLECTION_ID }}
55+
DISCOVERY_V2_URL: "https://api.us-south.discovery.watson.cloud.ibm.com"
56+
run: |
57+
cp Sources/SupportingFiles/WatsonCredentialsGHA.swift Sources/SupportingFiles/WatsonCredentials.swift
58+
echo -e "\n\033[0;35mCommand: Run AssistantV1 Integration tests"
59+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme AssistantV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "AssistantV1Tests/AssistantTests" | xcpretty
60+
echo -e "\n\033[0;35mCommand: Run AssistantV2 Integration tests"
61+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme AssistantV2 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
62+
echo -e "\n\033[0;35mCommand: Run DiscoveryV1 Integration tests"
63+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme DiscoveryV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "DiscoveryV1Tests/DiscoveryTests" | xcpretty
64+
echo -e "\n\033[0;35mCommand: Run DiscoveryV2 Integration tests"
65+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme DiscoveryV2 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "DiscoveryV2Tests/DiscoveryV2Tests" | xcpretty
66+
echo -e "\n\033[0;35mCommand: Run LanguageTranslatorV3 Integration tests"
67+
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme LanguageTranslatorV3 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
68+
echo -e "\n\033[0;35mCommand: Run NaturalLanguageUnderstandingV1 Integration tests"
69+
set -o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme NaturalLanguageUnderstandingV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty
70+
echo -e "\n\033[0;35mCommand: Run SpeechToTextV1 Integration tests"
71+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme SpeechToTextV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" -only-testing "SpeechToTextV1Tests/SpeechToTextTests" | xcpretty
72+
echo -e "\n\033[0;35mCommand: Run TextToSpeechV1 Integration tests"
73+
set +o pipefail && env NSUnbufferedIO=YES xcodebuild test -scheme TextToSpeechV1 -destination "platform=iOS Simulator,OS=latest,name=iPhone 12" | xcpretty

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Custom
22
Sources/SupportingFiles/Credentials.swift
33
Sources/SupportingFiles/WatsonCredentials.swift
4-
Tests/CompareComplyV1Tests/Resources/cloud-object-storage-credentials*
54

65
# Build generated
76
build/
@@ -47,7 +46,6 @@ Carthage/
4746

4847
# ignore detect secrets files
4948
.pre-commit-config.yaml
50-
.secrets.baseline
5149

5250
# swift package manager
5351
.swiftpm/

0 commit comments

Comments
 (0)