Skip to content

chore: Remove duplicate types and reference the type from the google.genai #6953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+288 −848
Open

chore: Remove duplicate types and reference the type from the google.genai #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions agentplatform/_genai/rag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from google.genai import _api_module
from google.genai import _common
from google.genai import _extra_utils
from google.genai import types as genai_types
from google.genai._common import get_value_by_path as getv
from google.genai._common import set_value_by_path as setv

Expand Down Expand Up @@ -2546,7 +2547,7 @@ def _update_config(
def retrieve_contexts(
self,
*,
vertex_rag_store: types.VertexRagStoreOrDict,
vertex_rag_store: genai_types.VertexRagStoreOrDict,
query: types.RagQueryOrDict,
config: Optional[types.RetrieveContextsConfigOrDict] = None,
) -> types.RetrieveContextsResponse:
Expand Down Expand Up @@ -4144,7 +4145,7 @@ async def _update_config(
async def retrieve_contexts(
self,
*,
vertex_rag_store: types.VertexRagStoreOrDict,
vertex_rag_store: genai_types.VertexRagStoreOrDict,
query: types.RagQueryOrDict,
config: Optional[types.RetrieveContextsConfigOrDict] = None,
) -> types.RetrieveContextsResponse:
Expand Down
102 changes: 0 additions & 102 deletions agentplatform/_genai/types/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,6 @@
from .common import AnalysisConfig
from .common import AnalysisConfigDict
from .common import AnalysisConfigOrDict
from .common import ApiAuth
from .common import ApiAuthApiKeyConfig
from .common import ApiAuthApiKeyConfigDict
from .common import ApiAuthApiKeyConfigOrDict
from .common import ApiAuthDict
from .common import ApiAuthOrDict
from .common import AppendAgentEngineSessionEventConfig
from .common import AppendAgentEngineSessionEventConfigDict
from .common import AppendAgentEngineSessionEventConfigOrDict
Expand Down Expand Up @@ -483,9 +477,6 @@
from .common import DnsPeeringConfig
from .common import DnsPeeringConfigDict
from .common import DnsPeeringConfigOrDict
from .common import EncryptionSpec
from .common import EncryptionSpecDict
from .common import EncryptionSpecOrDict
from .common import EnvVar
from .common import EnvVarDict
from .common import EnvVarOrDict
Expand Down Expand Up @@ -608,19 +599,10 @@
from .common import FailedRubric
from .common import FailedRubricDict
from .common import FailedRubricOrDict
from .common import FileStatus
from .common import FileStatusDict
from .common import FileStatusOrDict
from .common import FlexStart
from .common import FlexStartDict
from .common import FlexStartOrDict
from .common import Framework
from .common import GcsDestination
from .common import GcsDestinationDict
from .common import GcsDestinationOrDict
from .common import GcsSource
from .common import GcsSourceDict
from .common import GcsSourceOrDict
from .common import GeminiExample
from .common import GeminiExampleDict
from .common import GeminiExampleOrDict
Expand Down Expand Up @@ -763,9 +745,6 @@
from .common import GoogleDriveSourceResourceId
from .common import GoogleDriveSourceResourceIdDict
from .common import GoogleDriveSourceResourceIdOrDict
from .common import GoogleRpcStatus
from .common import GoogleRpcStatusDict
from .common import GoogleRpcStatusOrDict
from .common import IdentityType
from .common import Importance
from .common import ImportRagFilesConfig
Expand Down Expand Up @@ -1214,12 +1193,6 @@
from .common import QueryReasoningEngineResponse
from .common import QueryReasoningEngineResponseDict
from .common import QueryReasoningEngineResponseOrDict
from .common import RagChunk
from .common import RagChunkDict
from .common import RagChunkOrDict
from .common import RagChunkPageSpan
from .common import RagChunkPageSpanDict
from .common import RagChunkPageSpanOrDict
from .common import RagContexts
from .common import RagContextsContext
from .common import RagContextsContextDict
Expand Down Expand Up @@ -1315,24 +1288,6 @@
from .common import RagQueryRanking
from .common import RagQueryRankingDict
from .common import RagQueryRankingOrDict
from .common import RagRetrievalConfig
from .common import RagRetrievalConfigDict
from .common import RagRetrievalConfigFilter
from .common import RagRetrievalConfigFilterDict
from .common import RagRetrievalConfigFilterOrDict
from .common import RagRetrievalConfigHybridSearch
from .common import RagRetrievalConfigHybridSearchDict
from .common import RagRetrievalConfigHybridSearchOrDict
from .common import RagRetrievalConfigOrDict
from .common import RagRetrievalConfigRanking
from .common import RagRetrievalConfigRankingDict
from .common import RagRetrievalConfigRankingLlmRanker
from .common import RagRetrievalConfigRankingLlmRankerDict
from .common import RagRetrievalConfigRankingLlmRankerOrDict
from .common import RagRetrievalConfigRankingOrDict
from .common import RagRetrievalConfigRankingRankService
from .common import RagRetrievalConfigRankingRankServiceDict
from .common import RagRetrievalConfigRankingRankServiceOrDict
from .common import RagVectorDbConfig
from .common import RagVectorDbConfigDict
from .common import RagVectorDbConfigOrDict
Expand Down Expand Up @@ -1891,12 +1846,6 @@
from .common import VertexBaseConfig
from .common import VertexBaseConfigDict
from .common import VertexBaseConfigOrDict
from .common import VertexRagStore
from .common import VertexRagStoreDict
from .common import VertexRagStoreOrDict
from .common import VertexRagStoreRagResource
from .common import VertexRagStoreRagResourceDict
from .common import VertexRagStoreRagResourceOrDict
from .common import VulnerableTool
from .common import VulnerableToolDict
from .common import VulnerableToolOrDict
Expand Down Expand Up @@ -2670,36 +2619,12 @@
"AskContextsConfig",
"AskContextsConfigDict",
"AskContextsConfigOrDict",
"RagRetrievalConfigFilter",
"RagRetrievalConfigFilterDict",
"RagRetrievalConfigFilterOrDict",
"RagRetrievalConfigHybridSearch",
"RagRetrievalConfigHybridSearchDict",
"RagRetrievalConfigHybridSearchOrDict",
"RagRetrievalConfigRankingLlmRanker",
"RagRetrievalConfigRankingLlmRankerDict",
"RagRetrievalConfigRankingLlmRankerOrDict",
"RagRetrievalConfigRankingRankService",
"RagRetrievalConfigRankingRankServiceDict",
"RagRetrievalConfigRankingRankServiceOrDict",
"RagRetrievalConfigRanking",
"RagRetrievalConfigRankingDict",
"RagRetrievalConfigRankingOrDict",
"RagRetrievalConfig",
"RagRetrievalConfigDict",
"RagRetrievalConfigOrDict",
"RagQueryRanking",
"RagQueryRankingDict",
"RagQueryRankingOrDict",
"RagQuery",
"RagQueryDict",
"RagQueryOrDict",
"RagChunkPageSpan",
"RagChunkPageSpanDict",
"RagChunkPageSpanOrDict",
"RagChunk",
"RagChunkDict",
"RagChunkOrDict",
"RagContextsContext",
"RagContextsContextDict",
"RagContextsContextOrDict",
Expand All @@ -2724,9 +2649,6 @@
"RagCorpusCorpusTypeConfig",
"RagCorpusCorpusTypeConfigDict",
"RagCorpusCorpusTypeConfigOrDict",
"EncryptionSpec",
"EncryptionSpecDict",
"EncryptionSpecOrDict",
"RagEmbeddingModelConfigVertexPredictionEndpoint",
"RagEmbeddingModelConfigVertexPredictionEndpointDict",
"RagEmbeddingModelConfigVertexPredictionEndpointOrDict",
Expand All @@ -2742,12 +2664,6 @@
"RagEmbeddingModelConfig",
"RagEmbeddingModelConfigDict",
"RagEmbeddingModelConfigOrDict",
"ApiAuthApiKeyConfig",
"ApiAuthApiKeyConfigDict",
"ApiAuthApiKeyConfigOrDict",
"ApiAuth",
"ApiAuthDict",
"ApiAuthOrDict",
"RagVectorDbConfigPinecone",
"RagVectorDbConfigPineconeDict",
"RagVectorDbConfigPineconeOrDict",
Expand Down Expand Up @@ -2805,15 +2721,9 @@
"GetRagFileConfig",
"GetRagFileConfigDict",
"GetRagFileConfigOrDict",
"FileStatus",
"FileStatusDict",
"FileStatusOrDict",
"DirectUploadSource",
"DirectUploadSourceDict",
"DirectUploadSourceOrDict",
"GcsSource",
"GcsSourceDict",
"GcsSourceOrDict",
"GoogleDriveSourceResourceId",
"GoogleDriveSourceResourceIdDict",
"GoogleDriveSourceResourceIdOrDict",
Expand Down Expand Up @@ -2904,12 +2814,6 @@
"RetrieveContextsConfig",
"RetrieveContextsConfigDict",
"RetrieveContextsConfigOrDict",
"VertexRagStoreRagResource",
"VertexRagStoreRagResourceDict",
"VertexRagStoreRagResourceOrDict",
"VertexRagStore",
"VertexRagStoreDict",
"VertexRagStoreOrDict",
"RetrieveContextsResponse",
"RetrieveContextsResponseDict",
"RetrieveContextsResponseOrDict",
Expand All @@ -2925,9 +2829,6 @@
"BigQueryDestination",
"BigQueryDestinationDict",
"BigQueryDestinationOrDict",
"GcsDestination",
"GcsDestinationDict",
"GcsDestinationOrDict",
"RagFileChunkingConfigFixedLengthChunking",
"RagFileChunkingConfigFixedLengthChunkingDict",
"RagFileChunkingConfigFixedLengthChunkingOrDict",
Expand Down Expand Up @@ -2970,9 +2871,6 @@
"UploadRagFileConfig",
"UploadRagFileConfigDict",
"UploadRagFileConfigOrDict",
"GoogleRpcStatus",
"GoogleRpcStatusDict",
"GoogleRpcStatusOrDict",
"UploadRagFileResponse",
"UploadRagFileResponseDict",
"UploadRagFileResponseOrDict",
Expand Down
Loading
Loading