Skip to content

Commit a6cbb74

Browse files
gcf-owl-bot[bot]copybara-github
gcf-owl-bot[bot]
authored and
copybara-github
committed
Copybara import of the project:
-- 0f91e73 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add OFF to HarmBlockThreshold PiperOrigin-RevId: 671827417 Source-Link: googleapis/googleapis@9aad398 Source-Link: googleapis/googleapis-gen@428081a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDI4MDgxYWY0OTgxYzdhOGRjZTBiZGUwNDVjODZiYzk1NzhlNTBmMiJ9 -- 9538166 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- 1cc3a53 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add OFF to HarmBlockThreshold PiperOrigin-RevId: 671988102 Source-Link: googleapis/googleapis@cb39bdd Source-Link: googleapis/googleapis-gen@4f92fc4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGY5MmZjNGFjZDJhNjkxYWQ4YzBkNGJlOTU0NjEyN2QwMDBkMmMzOCJ9 -- 8c95f17 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- f716c80 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add share_point_sources to SharePointSources feat: add sharepoint_folder_path to SharePointSource feat: add sharepoint_folder_id to SharePointSource feat: add drive_name to SharePointSource feat: add drive_id to SharePointSource feat: add client_id to SharePointSource feat: add client_secret to SharePointSource feat: add tenant_id to SharePointSource feat: add sharepoint_site_name to SharePointSource feat: add share_point_sources to ImportRagFilesConfig feat: add partial_failure_gcs_sink tp ImportRagFilesConfig feat: add partial_failure_bigquery_sink to ImportRagFilesConfig PiperOrigin-RevId: 672615314 Source-Link: googleapis/googleapis@ca82297 Source-Link: googleapis/googleapis-gen@bf7ddca Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYmY3ZGRjYTY1YTA3MWJkZWE3YmM4Y2Q4OWRiMTM1NzA0NTYwMjBjMCJ9 -- 6721e4b by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- bd4ddeb by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add Pinecone and Vector Search integration for Vertex RAG PiperOrigin-RevId: 673087899 Source-Link: googleapis/googleapis@afb6b35 Source-Link: googleapis/googleapis-gen@00a4515 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDBhNDUxNWFiNDY1ZTk4ZDU2NjI3MDc1Njc1MjA5NjMxZWU1MWYzOSJ9 -- 0c3f176 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- 3c30eb9 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add file_id to SharePointSource feat: add share_point_sources to RagFile PiperOrigin-RevId: 673921028 Source-Link: googleapis/googleapis@9382d74 Source-Link: googleapis/googleapis-gen@7cb8810 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiN2NiODgxMGQyZWFlNWE2MWQ0OTcyZTFlNzBiN2MzZWVmZGIxYzk2YiJ9 -- a83cb88 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- 2ca5eb6 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: A new field `property_ordering` is added to message `.google.cloud.aiplatform.v1beta1.Schema` PiperOrigin-RevId: 674918528 Source-Link: googleapis/googleapis@65306b9 Source-Link: googleapis/googleapis-gen@442fa35 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDQyZmEzNWQxNjQxZGU0ZmY0ZmVmZDhkNmU2NzJhYTg5NmE1MTM1NCJ9 -- 5c8b0e9 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- 453ec68 by Amy Wu <wuamy@google.com>: Update snippet_metadata_google.cloud.aiplatform.v1.json -- 3aeb864 by Amy Wu <wuamy@google.com>: Update snippet_metadata_google.cloud.aiplatform.v1beta1.json -- 1b3a61d by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: A new field `property_ordering` is added to message `.google.cloud.aiplatform.v1.Schema` PiperOrigin-RevId: 675187467 Source-Link: googleapis/googleapis@38d33ad Source-Link: googleapis/googleapis-gen@95e20a9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTVlMjBhOTU0N2UxY2JjYjBhMmNlNDQzZjYyZDA1YmMwMDFhNzliYiJ9 -- b94f5a0 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md -- 775b14e by Amy Wu <wuamy@google.com>: Update snippet_metadata_google.cloud.aiplatform.v1.json -- 5cfd992 by Amy Wu <wuamy@google.com>: Update snippet_metadata_google.cloud.aiplatform.v1beta1.json COPYBARA_INTEGRATE_REVIEW=#4360 from googleapis:owl-bot-copy 5cfd992 PiperOrigin-RevId: 675263166
1 parent 32f5b25 commit a6cbb74

19 files changed

+335
-40
lines changed

‎google/cloud/aiplatform_v1/services/migration_service/client.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -216,40 +216,40 @@ def parse_annotated_dataset_path(path: str) -> Dict[str, str]:
216216
@staticmethod
217217
def dataset_path(
218218
project: str,
219-
location: str,
220219
dataset: str,
221220
) -> str:
222221
"""Returns a fully-qualified dataset string."""
223-
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
222+
return "projects/{project}/datasets/{dataset}".format(
224223
project=project,
225-
location=location,
226224
dataset=dataset,
227225
)
228226

229227
@staticmethod
230228
def parse_dataset_path(path: str) -> Dict[str, str]:
231229
"""Parses a dataset path into its component segments."""
232-
m = re.match(
233-
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
234-
path,
235-
)
230+
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
236231
return m.groupdict() if m else {}
237232

238233
@staticmethod
239234
def dataset_path(
240235
project: str,
236+
location: str,
241237
dataset: str,
242238
) -> str:
243239
"""Returns a fully-qualified dataset string."""
244-
return "projects/{project}/datasets/{dataset}".format(
240+
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
245241
project=project,
242+
location=location,
246243
dataset=dataset,
247244
)
248245

249246
@staticmethod
250247
def parse_dataset_path(path: str) -> Dict[str, str]:
251248
"""Parses a dataset path into its component segments."""
252-
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
249+
m = re.match(
250+
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
251+
path,
252+
)
253253
return m.groupdict() if m else {}
254254

255255
@staticmethod

‎google/cloud/aiplatform_v1/types/content.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,12 +520,15 @@ class HarmBlockThreshold(proto.Enum):
520520
Block only high threshold (i.e. block less).
521521
BLOCK_NONE (4):
522522
Block none.
523+
OFF (5):
524+
Turn off the safety filter.
523525
"""
524526
HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0
525527
BLOCK_LOW_AND_ABOVE = 1
526528
BLOCK_MEDIUM_AND_ABOVE = 2
527529
BLOCK_ONLY_HIGH = 3
528530
BLOCK_NONE = 4
531+
OFF = 5
529532

530533
class HarmBlockMethod(proto.Enum):
531534
r"""Probability vs severity.

‎google/cloud/aiplatform_v1/types/openapi.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ class Type(proto.Enum):
6363
class Schema(proto.Message):
6464
r"""Schema is used to define the format of input/output data. Represents
6565
a select subset of an `OpenAPI 3.0 schema
66-
object <https://spec.openapis.org/oas/v3.0.3#schema>`__. More fields
67-
may be added in the future as needed.
66+
object <https://spec.openapis.org/oas/v3.0.3#schema-object>`__. More
67+
fields may be added in the future as needed.
6868
6969
Attributes:
7070
type_ (google.cloud.aiplatform_v1.types.Type):
@@ -101,6 +101,10 @@ class Schema(proto.Message):
101101
properties (MutableMapping[str, google.cloud.aiplatform_v1.types.Schema]):
102102
Optional. SCHEMA FIELDS FOR TYPE OBJECT
103103
Properties of Type.OBJECT.
104+
property_ordering (MutableSequence[str]):
105+
Optional. The order of the properties.
106+
Not a standard field in open api spec. Only used
107+
to support the order of the properties.
104108
required (MutableSequence[str]):
105109
Optional. Required properties of Type.OBJECT.
106110
min_properties (int):
@@ -178,6 +182,10 @@ class Schema(proto.Message):
178182
number=3,
179183
message="Schema",
180184
)
185+
property_ordering: MutableSequence[str] = proto.RepeatedField(
186+
proto.STRING,
187+
number=25,
188+
)
181189
required: MutableSequence[str] = proto.RepeatedField(
182190
proto.STRING,
183191
number=5,

‎google/cloud/aiplatform_v1beta1/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@
531531
from .types.io import GcsSource
532532
from .types.io import GoogleDriveSource
533533
from .types.io import JiraSource
534+
from .types.io import SharePointSources
534535
from .types.io import SlackSource
535536
from .types.io import TFRecordDestination
536537
from .types.job_service import CancelBatchPredictionJobRequest
@@ -1884,6 +1885,7 @@
18841885
"SearchNearestEntitiesResponse",
18851886
"Segment",
18861887
"ServiceAccountSpec",
1888+
"SharePointSources",
18871889
"ShieldedVmConfig",
18881890
"SlackSource",
18891891
"SmoothGradConfig",

‎google/cloud/aiplatform_v1beta1/services/vertex_rag_data_service/async_client.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,7 @@ async def sample_import_rag_files():
10741074
# Initialize request argument(s)
10751075
import_rag_files_config = aiplatform_v1beta1.ImportRagFilesConfig()
10761076
import_rag_files_config.gcs_source.uris = ['uris_value1', 'uris_value2']
1077+
import_rag_files_config.partial_failure_gcs_sink.output_uri_prefix = "output_uri_prefix_value"
10771078
10781079
request = aiplatform_v1beta1.ImportRagFilesRequest(
10791080
parent="parent_value",

‎google/cloud/aiplatform_v1beta1/services/vertex_rag_data_service/client.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,6 +1557,7 @@ def sample_import_rag_files():
15571557
# Initialize request argument(s)
15581558
import_rag_files_config = aiplatform_v1beta1.ImportRagFilesConfig()
15591559
import_rag_files_config.gcs_source.uris = ['uris_value1', 'uris_value2']
1560+
import_rag_files_config.partial_failure_gcs_sink.output_uri_prefix = "output_uri_prefix_value"
15601561
15611562
request = aiplatform_v1beta1.ImportRagFilesRequest(
15621563
parent="parent_value",

‎google/cloud/aiplatform_v1beta1/types/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@
542542
GcsSource,
543543
GoogleDriveSource,
544544
JiraSource,
545+
SharePointSources,
545546
SlackSource,
546547
TFRecordDestination,
547548
)
@@ -1621,6 +1622,7 @@
16211622
"GcsSource",
16221623
"GoogleDriveSource",
16231624
"JiraSource",
1625+
"SharePointSources",
16241626
"SlackSource",
16251627
"TFRecordDestination",
16261628
"CancelBatchPredictionJobRequest",

‎google/cloud/aiplatform_v1beta1/types/content.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,12 +520,15 @@ class HarmBlockThreshold(proto.Enum):
520520
Block only high threshold (i.e. block less).
521521
BLOCK_NONE (4):
522522
Block none.
523+
OFF (5):
524+
Turn off the safety filter.
523525
"""
524526
HARM_BLOCK_THRESHOLD_UNSPECIFIED = 0
525527
BLOCK_LOW_AND_ABOVE = 1
526528
BLOCK_MEDIUM_AND_ABOVE = 2
527529
BLOCK_ONLY_HIGH = 3
528530
BLOCK_NONE = 4
531+
OFF = 5
529532

530533
class HarmBlockMethod(proto.Enum):
531534
r"""Probability vs severity.

‎google/cloud/aiplatform_v1beta1/types/io.py‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"DirectUploadSource",
4040
"SlackSource",
4141
"JiraSource",
42+
"SharePointSources",
4243
},
4344
)
4445

@@ -400,4 +401,110 @@ class JiraQueries(proto.Message):
400401
)
401402

402403

404+
class SharePointSources(proto.Message):
405+
r"""The SharePointSources to pass to ImportRagFiles.
406+
407+
Attributes:
408+
share_point_sources (MutableSequence[google.cloud.aiplatform_v1beta1.types.SharePointSources.SharePointSource]):
409+
The SharePoint sources.
410+
"""
411+
412+
class SharePointSource(proto.Message):
413+
r"""An individual SharePointSource.
414+
415+
This message has `oneof`_ fields (mutually exclusive fields).
416+
For each oneof, at most one member field can be set at the same time.
417+
Setting any member of the oneof automatically clears all other
418+
members.
419+
420+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
421+
422+
Attributes:
423+
sharepoint_folder_path (str):
424+
The path of the SharePoint folder to download
425+
from.
426+
427+
This field is a member of `oneof`_ ``folder_source``.
428+
sharepoint_folder_id (str):
429+
The ID of the SharePoint folder to download
430+
from.
431+
432+
This field is a member of `oneof`_ ``folder_source``.
433+
drive_name (str):
434+
The name of the drive to download from.
435+
436+
This field is a member of `oneof`_ ``drive_source``.
437+
drive_id (str):
438+
The ID of the drive to download from.
439+
440+
This field is a member of `oneof`_ ``drive_source``.
441+
client_id (str):
442+
The Application ID for the app registered in
443+
Microsoft Azure Portal. The application must
444+
also be configured with MS Graph permissions
445+
"Files.ReadAll", "Sites.ReadAll" and
446+
BrowserSiteLists.Read.All.
447+
client_secret (google.cloud.aiplatform_v1beta1.types.ApiAuth.ApiKeyConfig):
448+
The application secret for the app registered
449+
in Azure.
450+
tenant_id (str):
451+
Unique identifier of the Azure Active
452+
Directory Instance.
453+
sharepoint_site_name (str):
454+
The name of the SharePoint site to download
455+
from. This can be the site name or the site id.
456+
file_id (str):
457+
Output only. The SharePoint file id. Output
458+
only.
459+
"""
460+
461+
sharepoint_folder_path: str = proto.Field(
462+
proto.STRING,
463+
number=5,
464+
oneof="folder_source",
465+
)
466+
sharepoint_folder_id: str = proto.Field(
467+
proto.STRING,
468+
number=6,
469+
oneof="folder_source",
470+
)
471+
drive_name: str = proto.Field(
472+
proto.STRING,
473+
number=7,
474+
oneof="drive_source",
475+
)
476+
drive_id: str = proto.Field(
477+
proto.STRING,
478+
number=8,
479+
oneof="drive_source",
480+
)
481+
client_id: str = proto.Field(
482+
proto.STRING,
483+
number=1,
484+
)
485+
client_secret: api_auth.ApiAuth.ApiKeyConfig = proto.Field(
486+
proto.MESSAGE,
487+
number=2,
488+
message=api_auth.ApiAuth.ApiKeyConfig,
489+
)
490+
tenant_id: str = proto.Field(
491+
proto.STRING,
492+
number=3,
493+
)
494+
sharepoint_site_name: str = proto.Field(
495+
proto.STRING,
496+
number=4,
497+
)
498+
file_id: str = proto.Field(
499+
proto.STRING,
500+
number=9,
501+
)
502+
503+
share_point_sources: MutableSequence[SharePointSource] = proto.RepeatedField(
504+
proto.MESSAGE,
505+
number=1,
506+
message=SharePointSource,
507+
)
508+
509+
403510
__all__ = tuple(sorted(__protobuf__.manifest))

‎google/cloud/aiplatform_v1beta1/types/openapi.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ class Type(proto.Enum):
6363
class Schema(proto.Message):
6464
r"""Schema is used to define the format of input/output data. Represents
6565
a select subset of an `OpenAPI 3.0 schema
66-
object <https://spec.openapis.org/oas/v3.0.3#schema>`__. More fields
67-
may be added in the future as needed.
66+
object <https://spec.openapis.org/oas/v3.0.3#schema-object>`__. More
67+
fields may be added in the future as needed.
6868
6969
Attributes:
7070
type_ (google.cloud.aiplatform_v1beta1.types.Type):
@@ -101,6 +101,10 @@ class Schema(proto.Message):
101101
properties (MutableMapping[str, google.cloud.aiplatform_v1beta1.types.Schema]):
102102
Optional. SCHEMA FIELDS FOR TYPE OBJECT
103103
Properties of Type.OBJECT.
104+
property_ordering (MutableSequence[str]):
105+
Optional. The order of the properties.
106+
Not a standard field in open api spec. Only used
107+
to support the order of the properties.
104108
required (MutableSequence[str]):
105109
Optional. Required properties of Type.OBJECT.
106110
min_properties (int):
@@ -178,6 +182,10 @@ class Schema(proto.Message):
178182
number=3,
179183
message="Schema",
180184
)
185+
property_ordering: MutableSequence[str] = proto.RepeatedField(
186+
proto.STRING,
187+
number=25,
188+
)
181189
required: MutableSequence[str] = proto.RepeatedField(
182190
proto.STRING,
183191
number=5,

0 commit comments

Comments
 (0)