Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 config.cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ embedding:
# embedding service config
# for external embedding service, set CC_EM_BASE_URL and CC_EM_APIKEY env vars during deployment
# if the env vars are set, this config is ignored
# request_timeout is always respected even for remote service
# connect_timeout and request_timeout are always respected even for remote service
base_url: http://localhost:5000/v1
workers: 1
request_timeout: 1800 # in seconds
connect_timeout: 15 # in seconds
request_timeout: 1750 # in seconds
# batch_size: 100 # max texts per embedding API request, 0 = no batching
# only for external embedding service
# remote_service: true
Expand Down
5 changes: 3 additions & 2 deletions config.gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ embedding:
# embedding service config
# for external embedding service, set CC_EM_BASE_URL and CC_EM_APIKEY env vars during deployment
# if the env vars are set, this config is ignored
# request_timeout is always respected even for remote service
# connect_timeout and request_timeout are always respected even for remote service
base_url: http://localhost:5000/v1
workers: 1
request_timeout: 1800 # in seconds
connect_timeout: 15 # in seconds
request_timeout: 1750 # in seconds
# batch_size: 100 # max texts per embedding API request, 0 = no batching
# only for external embedding service
# remote_service: true
Expand Down
3 changes: 2 additions & 1 deletion context_chat_backend/config_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ def get_config(file_path: str) -> TConfig:
auth=auth,
remote_service=True,
workers=0,
request_timeout=embedding.get('request_timeout', 1800) if embedding else 1800,
connect_timeout=embedding.get('connect_timeout', 15) if embedding else 15,
request_timeout=embedding.get('request_timeout', 1750) if embedding else 1750,
batch_size=int(os.getenv('CC_EM_BATCH_SIZE', 100)),
)
except Exception as e:
Expand Down
5 changes: 4 additions & 1 deletion context_chat_backend/network_em.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ def _get_embedding(self, input_: str | list[str], try_: int = 3) -> list[float]
response = niquests.post(
f'{emconf.base_url.removesuffix("/")}/embeddings',
json=data,
timeout=emconf.request_timeout,
timeout=niquests.TimeoutConfiguration(
connect=emconf.connect_timeout,
read=emconf.request_timeout,
),
auth=auth,
verify=self.app_config.verify_ssl,
)
Expand Down
1 change: 1 addition & 0 deletions context_chat_backend/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class TEmbeddingAuthBasic(BaseModel):
class TEmbeddingConfig(BaseModel):
base_url: str = 'http://localhost:5000/v1'
workers: int = 1
connect_timeout: int = 15
request_timeout: int = 1750
model_name: str | None = DEFAULT_EM_MODEL_ALIAS
auth: TEmbeddingAuthApiKey | TEmbeddingAuthBasic | None = None
Expand Down
Loading