Skip to content
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

Fix/data store endpoints #172

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Fix/data store endpoints #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8d1ff2
fix: correct data store api endpoint build for DRZ
kmaphoenix Feb 5, 2024
8899bf4
chore: modify method name
kmaphoenix Feb 8, 2024
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
23 changes: 18 additions & 5 deletions src/dfcx_scrapi/core/data_stores.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __init__(
self.project_id = project_id

@staticmethod
def __get_content_config(content_type: str) -> DataStore.ContentConfig:
def _get_content_config(content_type: str) -> DataStore.ContentConfig:
"""Build the Content Config used for the Data Store."""
cc_map = {
"unstructured": 1,
Expand Down Expand Up @@ -82,7 +82,12 @@ def list_data_stores(
self, location: str = "global") -> List[DataStore]:
"""List all data stores for a given project and location."""
parent = self._build_data_store_parent(location)
client = discoveryengine_v1alpha.DataStoreServiceClient()
client_options = self._client_options_discovery_engine(
f"projects/{self.project_id}/locations/{location}"
)
client = discoveryengine_v1alpha.DataStoreServiceClient(
credentials=self.creds, client_options=client_options
)
request = discoveryengine_v1alpha.ListDataStoresRequest(parent=parent)
page_result = client.list_data_stores(request=request)

Expand All @@ -94,7 +99,10 @@ def list_data_stores(

def get_data_store(self, data_store_id: str) -> DataStore:
"""Get a single Data Store by specified ID."""
client = discoveryengine_v1alpha.DataStoreServiceClient()
client_options = self._client_options_discovery_engine(data_store_id)
client = discoveryengine_v1alpha.DataStoreServiceClient(
credentials=self.creds, client_options=client_options
)
request = discoveryengine_v1alpha.GetDataStoreRequest(
name=data_store_id
)
Expand Down Expand Up @@ -122,12 +130,17 @@ def create_datastore(
location: the GCP region to create the Data Store in
"""
parent = self._build_data_store_parent(location)
client = discoveryengine_v1alpha.DataStoreServiceClient()
client_options = self._client_options_discovery_engine(
f"projects/{self.project_id}/locations/{location}"
)
client = discoveryengine_v1alpha.DataStoreServiceClient(
credentials=self.creds, client_options=client_options
)
data_store = discoveryengine_v1alpha.DataStore()
data_store.display_name = display_name
data_store.industry_vertical = 1
data_store.solution_types = [self._get_solution_type(solution_type)]
data_store.content_config = self.__get_content_config(datastore_type)
data_store.content_config = self._get_content_config(datastore_type)

request = discoveryengine_v1alpha.CreateDataStoreRequest(
parent=parent,
Expand Down
Loading