vectorvein 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

vectorvein/chat_clients/utils.py

@@ -116,9 +116,14 @@ def convert_type(value, value_type):
 
 def get_token_counts(text: str | dict, model: str = "", use_token_server_first: bool = False) -> int:
     if use_token_server_first and settings.token_server is not None:
+        base_url = (
+            settings.token_server.url
+            if settings.token_server.url is not None
+            else f"http://{settings.token_server.host}:{settings.token_server.port}"
+        )
         _, response = (
             Retry(httpx.post)
-            .args(url=settings.token_server, json={"text": text, "model": model}, timeout=None)
+            .args(url=f"{base_url}/count_tokens", json={"text": text, "model": model}, timeout=None)
             .retry_times(5)
             .sleep_time(1)
             .run()
@@ -199,7 +204,7 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)
-        url = f"{endpoint.api_base}/models/{model_setting.id}:countTokens"
+        base_url = f"{endpoint.api_base}/models/{model_setting.id}:countTokens"
         params = {"key": endpoint.api_key}
         request_body = {
             "contents": {
@@ -211,7 +216,7 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         }
         _, response = (
             Retry(httpx.post)
-            .args(url, json=request_body, params=params, timeout=None)
+            .args(base_url, json=request_body, params=params, timeout=None)
             .retry_times(5)
             .sleep_time(10)
             .run()

vectorvein/server/token_server.py

@@ -31,16 +31,16 @@ def run_token_server(host: str | None = None, port: int | None = None):
         port (int): 服务器端口。
     """
     if host is None or port is None:
-        token_server_url = settings.token_server
-        if token_server_url is None:
+        if settings.token_server is None:
             raise ValueError("Token server is not enabled.")
 
-        _host, _port = token_server_url.split(":")
+        _host = settings.token_server.host
+        _port = settings.token_server.port
     else:
         _host = host
         _port = port
 
-    uvicorn.run(token_server, host=_host, port=int(_port))
+    uvicorn.run(token_server, host=_host, port=_port)
 
 
 if __name__ == "__main__":

vectorvein/settings/__init__.py

@@ -9,11 +9,17 @@ from ..types.enums import BackendType
 from ..types.llm_parameters import BackendSettings, EndpointSetting
 
 
+class Server(BaseModel):
+    host: str
+    port: int
+    url: Optional[str]
+
+
 class Settings(BaseModel):
     endpoints: List[EndpointSetting] = Field(
         default_factory=list, description="Available endpoints for the LLM service."
     )
-    token_server: Optional[str] = Field(default=None, description="Token server address. Format: host:port")
+    token_server: Optional[Server] = Field(default=None, description="Token server address. Format: host:port")
 
     anthropic: BackendSettings = Field(default_factory=BackendSettings, description="Anthropic models settings.")
     deepseek: BackendSettings = Field(default_factory=BackendSettings, description="Deepseek models settings.")

{vectorvein-0.1.42.dist-info → vectorvein-0.1.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.1.42
+Version: 0.1.43
 Summary: Default template for PDM package
 Author-Email: Anderson <andersonby@163.com>
 License: MIT

{vectorvein-0.1.42.dist-info → vectorvein-0.1.43.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.1.42.dist-info/METADATA,sha256=nsKbuRtzNcT0Qkrt1q9DSNoMzlAg0PoJBcQ6570T9mU,644
-vectorvein-0.1.42.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.1.42.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.1.43.dist-info/METADATA,sha256=XsswO1wZoO8V45KAfoTxijw_3n7Odna2N9zw-DGeEJ4,644
+vectorvein-0.1.43.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.1.43.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/__init__.py,sha256=dW169oK1n3v8Z0uD8itghzlCP72rxiaS-XYn6fvI2xM,16788
 vectorvein/chat_clients/anthropic_client.py,sha256=jF9pDlnkhjM6-OLPCQQxkh27xjzbTRaEY53olRd3_aY,32413
@@ -18,12 +18,12 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=FVm_ZYL9UP6t6hTUNxPyo
 vectorvein/chat_clients/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/chat_clients/qwen_client.py,sha256=-ryh-m9PgsO0fc4ulcCmPTy1155J8YUy15uPoJQOHA0,513
 vectorvein/chat_clients/stepfun_client.py,sha256=zsD2W5ahmR4DD9cqQTXmJr3txrGuvxbRWhFlRdwNijI,519
-vectorvein/chat_clients/utils.py,sha256=CRwjzMkYRHs0onKf87KxseG08b4zjAjZxi00-gQPYHc,25253
+vectorvein/chat_clients/utils.py,sha256=mzmN5qGDiF3B4ApMY_Xq4sOWs8kiskcrI7bzyFBCsa4,25475
 vectorvein/chat_clients/yi_client.py,sha256=RNf4CRuPJfixrwLZ3-DEc3t25QDe1mvZeb9sku2f8Bc,484
 vectorvein/chat_clients/zhipuai_client.py,sha256=Ys5DSeLCuedaDXr3PfG1EW2zKXopt-awO2IylWSwY0s,519
 vectorvein/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vectorvein/server/token_server.py,sha256=mk7hbhagBc3q-5a7q3o0wNBkx-f0A4GTShqDD2bwkqA,1367
-vectorvein/settings/__init__.py,sha256=tYC8hSAYIUxpcJTx7zhpTSdNqc5fVeYPE1IhOTTTpRA,3684
+vectorvein/server/token_server.py,sha256=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
+vectorvein/settings/__init__.py,sha256=dyTCLhevXiKVJhOb1tjgZGMH38Indy4dkWVdDX543g0,3771
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/defaults.py,sha256=xefmRNYBGbnWA5kjLLFKN91UM5gnHZ5-kcCNlQRfznk,22095
 vectorvein/types/enums.py,sha256=x_S0IJiEWijOAEiMNdiGDGEWGtmt7TwMriJVDqrDmTo,1637
@@ -32,4 +32,4 @@ vectorvein/types/llm_parameters.py,sha256=vhleSgCHzDl7EULYJ3dUYlu9KLbfs9y6dcPD0B
 vectorvein/types/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/utilities/media_processing.py,sha256=cnzLrU1OaJvSv87IOnc36FrDXtmGMDStPbxtIJ33YN4,5880
 vectorvein/utilities/retry.py,sha256=6KFS9R2HdhqM3_9jkjD4F36ZSpEx2YNFGOVlpOsUetM,2208
-vectorvein-0.1.42.dist-info/RECORD,,
+vectorvein-0.1.43.dist-info/RECORD,,