Skip to content

Commit 1209965

Browse files
committed
Merge branch 'main' into spanner-v2-owlbot-updates
2 parents a5a236e + 82fc6fa commit 1209965

File tree

178 files changed

+7250
-672
lines changed

Some content is hidden

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

178 files changed

+7250
-672
lines changed

.kokoro/docs/publish.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ $PROJECT_DIR/dev/google-cloud docfx \
6363
# Add product-neutral guides
6464
$PROJECT_DIR/dev/google-cloud docfx \
6565
--generate-product-neutral-guides \
66+
--out help-out \
6667
--metadata-version 1.0.0 \
6768
$STAGING_FLAG \
6869
$VERBOSITY_FLAG

AiPlatform/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.0
1+
1.18.0
173 Bytes
Binary file not shown.

AiPlatform/src/V1/GenerateContentResponse.php

Lines changed: 82 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AiPlatform/tests/Unit/V1/Client/PredictionServiceClientTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,10 @@ public function generateContentTest()
299299
$this->assertTrue($transport->isExhausted());
300300
// Mock response
301301
$modelVersion = 'modelVersion-1669102142';
302+
$responseId = 'responseId1847552473';
302303
$expectedResponse = new GenerateContentResponse();
303304
$expectedResponse->setModelVersion($modelVersion);
305+
$expectedResponse->setResponseId($responseId);
304306
$transport->addResponse($expectedResponse);
305307
// Mock request
306308
$model = 'model104069929';
@@ -779,16 +781,22 @@ public function streamGenerateContentTest()
779781
$this->assertTrue($transport->isExhausted());
780782
// Mock response
781783
$modelVersion = 'modelVersion-1669102142';
784+
$responseId = 'responseId1847552473';
782785
$expectedResponse = new GenerateContentResponse();
783786
$expectedResponse->setModelVersion($modelVersion);
787+
$expectedResponse->setResponseId($responseId);
784788
$transport->addResponse($expectedResponse);
785789
$modelVersion2 = 'modelVersion2-1984354059';
790+
$responseId2 = 'responseId21676436300';
786791
$expectedResponse2 = new GenerateContentResponse();
787792
$expectedResponse2->setModelVersion($modelVersion2);
793+
$expectedResponse2->setResponseId($responseId2);
788794
$transport->addResponse($expectedResponse2);
789795
$modelVersion3 = 'modelVersion3-1984354058';
796+
$responseId3 = 'responseId31676436301';
790797
$expectedResponse3 = new GenerateContentResponse();
791798
$expectedResponse3->setModelVersion($modelVersion3);
799+
$expectedResponse3->setResponseId($responseId3);
792800
$transport->addResponse($expectedResponse3);
793801
// Mock request
794802
$model = 'model104069929';

AppsChat/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.8.0
1+
0.8.1

AppsChat/src/Chat/V1/SlashCommand.php

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Batch/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.7
1+
1.2.0

Batch/metadata/V1/Batch.php

Lines changed: 13 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Batch/metadata/V1/Job.php

46 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)