Skip to content
This repository was archived by the owner on May 7, 2026. It is now read-only.

fix: deprecate the remote_service_type in llm model #180

Merged
ashleyxuu merged 2 commits into from
Nov 7, 2023
Merged

fix: deprecate the remote_service_type in llm model #180

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b6b5c
fix: deprecate the remote_service_type in llm model
ashleyxuu Nov 7, 2023
4489a09
fix: address comments
ashleyxuu Nov 7, 2023
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
Prev Previous commit
fix: address comments
  • Loading branch information
@ashleyxuu
ashleyxuu committed Nov 7, 2023
commit 4489a09d14daed9e817ad4a958f375e3dc654ee3
32 changes: 21 additions & 11 deletions bigframes/ml/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
from bigframes.ml import base, core, globals, utils
import bigframes.pandas as bpd

_REMOTE_TEXT_GENERATOR_MODEL_CODE = "text-bison"
_REMOTE_TEXT_GENERATOR_32K_MODEL_CODE = "text-bison-32k"
_REMOTE_TEXT_GENERATOR_MODEL_ENDPOINT = "text-bison"
_REMOTE_TEXT_GENERATOR_32K_MODEL_ENDPOINT = "text-bison-32k"
_TEXT_GENERATE_RESULT_COLUMN = "ml_generate_text_llm_result"

_REMOTE_EMBEDDING_GENERATOR_MODEL_CODE = "textembedding-gecko"
_REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_CODE = "textembedding-gecko-multilingual"
_REMOTE_EMBEDDING_GENERATOR_MODEL_ENDPOINT = "textembedding-gecko"
_REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_ENDPOINT = (
"textembedding-gecko-multilingual"
)
_EMBED_TEXT_RESULT_COLUMN = "text_embedding"


Expand Down Expand Up @@ -88,14 +90,18 @@ def _create_bqml_model(self):
connection_id=connection_name_parts[2],
iam_role="aiplatform.user",
)
if self.model_name == "text-bison":
if self.model_name == _REMOTE_TEXT_GENERATOR_MODEL_ENDPOINT:
options = {
"endpoint": _REMOTE_TEXT_GENERATOR_MODEL_CODE,
"endpoint": _REMOTE_TEXT_GENERATOR_MODEL_ENDPOINT,
}
else:
elif self.model_name == _REMOTE_TEXT_GENERATOR_32K_MODEL_ENDPOINT:
options = {
"endpoint": _REMOTE_TEXT_GENERATOR_32K_MODEL_CODE,
"endpoint": _REMOTE_TEXT_GENERATOR_32K_MODEL_ENDPOINT,
}
else:
raise ValueError(
f"Model name {self.model_name} is not supported. We only support {_REMOTE_TEXT_GENERATOR_MODEL_ENDPOINT} and {_REMOTE_TEXT_GENERATOR_32K_MODEL_ENDPOINT}."
)
return self._bqml_model_factory.create_remote_model(
session=self.session, connection_name=self.connection_name, options=options
)
Expand Down Expand Up @@ -240,12 +246,16 @@ def _create_bqml_model(self):
)
if self.model_name == "textembedding-gecko":
options = {
"endpoint": _REMOTE_EMBEDDING_GENERATOR_MODEL_CODE,
"endpoint": _REMOTE_EMBEDDING_GENERATOR_MODEL_ENDPOINT,
}
else:
elif self.model_name == _REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_ENDPOINT:
options = {
"endpoint": _REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_CODE,
"endpoint": _REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_ENDPOINT,
}
else:
raise ValueError(
f"Model name {self.model_name} is not supported. We only support {_REMOTE_EMBEDDING_GENERATOR_MODEL_ENDPOINT} and {_REMOTE_EMBEDDING_GENERATOR_MUlTILINGUAL_MODEL_ENDPOINT}."
)

return self._bqml_model_factory.create_remote_model(
session=self.session, connection_name=self.connection_name, options=options
Expand Down