Skip to content

Commit 1011fb8

Browse files
committed
fix: fix the merging conflicts
1 parent ef0116a commit 1011fb8

File tree

3 files changed

+0
-52
lines changed

3 files changed

+0
-52
lines changed

bigframes/ml/llm.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ class PaLM2TextGenerator(base.Predictor):
5353
def __init__(
5454
self,
5555
model_name: Literal["text-bison", "text-bison-32k"] = "text-bison-32k",
56-
model_name: Literal["text-bison", "text-bison-32k"] = "text-bison-32k",
5756
session: Optional[bigframes.Session] = None,
5857
connection_name: Optional[str] = None,
5958
):
60-
self.model_name = model_name
6159
self.model_name = model_name
6260
self.session = session or bpd.get_global_session()
6361
self._bq_connection_manager = clients.BqConnectionManager(
@@ -99,15 +97,6 @@ def _create_bqml_model(self):
9997
options = {
10098
"endpoint": _REMOTE_TEXT_GENERATOR_32K_MODEL_CODE,
10199
}
102-
if self.model_name == "text-bison":
103-
options = {
104-
"remote_service_type": _REMOTE_TEXT_GENERATOR_MODEL_CODE,
105-
}
106-
else:
107-
options = {
108-
"endpoint": _REMOTE_TEXT_GENERATOR_32K_MODEL_CODE,
109-
}
110-
111100
return self._bqml_model_factory.create_remote_model(
112101
session=self.session, connection_name=self.connection_name, options=options
113102
)
@@ -215,13 +204,9 @@ def __init__(
215204
model_name: Literal[
216205
"textembedding-gecko", "textembedding-gecko-multilingual"
217206
] = "textembedding-gecko",
218-
model_name: Literal[
219-
"textembedding-gecko", "textembedding-gecko-multilingual"
220-
] = "textembedding-gecko",
221207
session: Optional[bigframes.Session] = None,
222208
connection_name: Optional[str] = None,
223209
):
224-
self.model_name = model_name
225210
self.model_name = model_name
226211
self.session = session or bpd.get_global_session()
227212
self._bq_connection_manager = clients.BqConnectionManager(

tests/system/small/ml/conftest.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,6 @@ def palm2_text_generator_32k_model(session, bq_connection) -> llm.PaLM2TextGener
220220
)
221221

222222

223-
@pytest.fixture(scope="session")
224-
def palm2_text_generator_32k_model(session, bq_connection) -> llm.PaLM2TextGenerator:
225-
return llm.PaLM2TextGenerator(
226-
model_name="text-bison-32k", session=session, connection_name=bq_connection
227-
)
228-
229-
230223
@pytest.fixture(scope="function")
231224
def ephemera_palm2_text_generator_model(
232225
session, bq_connection

tests/system/small/ml/test_llm.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ def test_create_text_generator_32k_model(palm2_text_generator_32k_model):
3232
assert palm2_text_generator_32k_model._bqml_model is not None
3333

3434

35-
def test_create_text_generator_32k_model(palm2_text_generator_32k_model):
36-
# Model creation doesn't return error
37-
assert palm2_text_generator_32k_model is not None
38-
assert palm2_text_generator_32k_model._bqml_model is not None
39-
40-
4135
@pytest.mark.flaky(retries=2, delay=120)
4236
def test_create_text_generator_model_default_session(bq_connection, llm_text_pandas_df):
4337
import bigframes.pandas as bpd
@@ -84,30 +78,6 @@ def test_create_text_generator_32k_model_default_session(
8478
assert all(series.str.len() > 20)
8579

8680

87-
@pytest.mark.flaky(retries=2, delay=120)
88-
def test_create_text_generator_32k_model_default_session(
89-
bq_connection, llm_text_pandas_df
90-
):
91-
import bigframes.pandas as bpd
92-
93-
bpd.close_session()
94-
bpd.options.bigquery.bq_connection = bq_connection
95-
bpd.options.bigquery.location = "us"
96-
97-
model = llm.PaLM2TextGenerator(model_name="text-bison-32k")
98-
assert model is not None
99-
assert model._bqml_model is not None
100-
assert model.connection_name.casefold() == "bigframes-dev.us.bigframes-rf-conn"
101-
102-
llm_text_df = bpd.read_pandas(llm_text_pandas_df)
103-
104-
df = model.predict(llm_text_df).to_pandas()
105-
TestCase().assertSequenceEqual(df.shape, (3, 1))
106-
assert "ml_generate_text_llm_result" in df.columns
107-
series = df["ml_generate_text_llm_result"]
108-
assert all(series.str.len() > 20)
109-
110-
11181
@pytest.mark.flaky(retries=2, delay=120)
11282
def test_create_text_generator_model_default_connection(llm_text_pandas_df):
11383
from bigframes import _config

0 commit comments

Comments
 (0)