Skip to content

Commit b4c65d0

Browse files
changes for adding internalConnectionURL (#112)
1 parent 23429be commit b4c65d0

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

singlestoredb/ai/chat.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@ def SingleStoreChatFactory(
5858
model_name=model_name,
5959
name='',
6060
connection_url=base_url,
61+
internal_connection_url=base_url,
6162
project_id='',
6263
hosting_platform=hosting_platform,
6364
)
6465
if base_url is not None:
6566
info.connection_url = base_url
67+
info.internal_connection_url = base_url
6668
if hosting_platform is not None:
6769
info.hosting_platform = hosting_platform
6870

@@ -98,7 +100,7 @@ def SingleStoreChatFactory(
98100
cfg = Config(**cfg_kwargs)
99101
client = boto3.client(
100102
'bedrock-runtime',
101-
endpoint_url=info.connection_url,
103+
endpoint_url=info.internal_connection_url,
102104
region_name='us-east-1',
103105
aws_access_key_id='placeholder',
104106
aws_secret_access_key='placeholder',
@@ -138,7 +140,7 @@ def _inject_headers(request: Any, **_ignored: Any) -> None:
138140

139141
return ChatBedrockConverse(
140142
model_id=model_name,
141-
endpoint_url=info.connection_url,
143+
endpoint_url=info.internal_connection_url,
142144
region_name='us-east-1',
143145
aws_access_key_id='placeholder',
144146
aws_secret_access_key='placeholder',
@@ -152,7 +154,7 @@ def _inject_headers(request: Any, **_ignored: Any) -> None:
152154
token = api_key if api_key is not None else token_env
153155

154156
openai_kwargs = dict(
155-
base_url=info.connection_url,
157+
base_url=info.internal_connection_url,
156158
api_key=token,
157159
model=model_name,
158160
streaming=streaming,

singlestoredb/ai/embeddings.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ def SingleStoreEmbeddingsFactory(
5757
model_name=model_name,
5858
name='',
5959
connection_url=base_url,
60+
internal_connection_url=base_url,
6061
project_id='',
6162
hosting_platform=hosting_platform,
6263
)
6364
if base_url is not None:
6465
info.connection_url = base_url
66+
info.internal_connection_url = base_url
6567
if hosting_platform is not None:
6668
info.hosting_platform = hosting_platform
6769

@@ -97,7 +99,7 @@ def SingleStoreEmbeddingsFactory(
9799
cfg = Config(**cfg_kwargs)
98100
client = boto3.client(
99101
'bedrock-runtime',
100-
endpoint_url=info.connection_url,
102+
endpoint_url=info.internal_connection_url,
101103
region_name='us-east-1',
102104
aws_access_key_id='placeholder',
103105
aws_secret_access_key='placeholder',
@@ -129,7 +131,7 @@ def _inject_headers(request: Any, **_ignored: Any) -> None:
129131

130132
return BedrockEmbeddings(
131133
model_id=model_name,
132-
endpoint_url=info.connection_url,
134+
endpoint_url=info.internal_connection_url,
133135
region_name='us-east-1',
134136
aws_access_key_id='placeholder',
135137
aws_secret_access_key='placeholder',
@@ -142,7 +144,7 @@ def _inject_headers(request: Any, **_ignored: Any) -> None:
142144
token = api_key if api_key is not None else token_env
143145

144146
openai_kwargs = dict(
145-
base_url=info.connection_url,
147+
base_url=info.internal_connection_url,
146148
api_key=token,
147149
model=model_name,
148150
)

singlestoredb/management/inference_api.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ class InferenceAPIInfo(object):
152152
model_name: str
153153
name: str
154154
connection_url: str
155+
internal_connection_url: str
155156
project_id: str
156157
hosting_platform: str
157158
_manager: Optional['InferenceAPIManager']
@@ -162,12 +163,14 @@ def __init__(
162163
model_name: str,
163164
name: str,
164165
connection_url: str,
166+
internal_connection_url: str,
165167
project_id: str,
166168
hosting_platform: str,
167169
manager: Optional['InferenceAPIManager'] = None,
168170
):
169171
self.service_id = service_id
170172
self.connection_url = connection_url
173+
self.internal_connection_url = internal_connection_url
171174
self.model_name = model_name
172175
self.name = name
173176
self.project_id = project_id
@@ -198,6 +201,7 @@ def from_dict(
198201
model_name=obj['modelName'],
199202
name=obj['name'],
200203
connection_url=obj['connectionURL'],
204+
internal_connection_url=obj['internalConnectionURL'],
201205
hosting_platform=obj['hostingPlatform'],
202206
)
203207
return out

0 commit comments

Comments
 (0)