vectorvein 0.2.19__py3-none-any.whl → 0.2.21__py3-none-any.whl

vectorvein/chat_clients/utils.py

@@ -130,10 +130,10 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
     elif model.startswith(("gpt-4o", "o1-")):
         return len(get_gpt_4o_encoding().encode(text))
     elif model.startswith(("abab", "MiniMax")):
-        model_setting = settings.minimax.models[model]
-        if len(model_setting.endpoints) == 0:
+        backend_setting = settings.get_backend(BackendType.MiniMax).models[model]
+        if len(backend_setting.endpoints) == 0:
             return int(len(text) / 1.33)
-        endpoint_id = model_setting.endpoints[0]
+        endpoint_id = backend_setting.endpoints[0]
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)
@@ -160,10 +160,10 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         result = response.json()
         return result["segments_num"]
     elif model.startswith("moonshot"):
-        model_setting = settings.moonshot.models[model]
-        if len(model_setting.endpoints) == 0:
+        backend_setting = settings.get_backend(BackendType.Moonshot).models[model]
+        if len(backend_setting.endpoints) == 0:
             return len(get_gpt_35_encoding().encode(text))
-        endpoint_id = model_setting.endpoints[0]
+        endpoint_id = backend_setting.endpoints[0]
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)
@@ -187,10 +187,10 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         result = response.json()
         return result["data"]["total_tokens"]
     elif model.startswith("gemini"):
-        model_setting = settings.gemini.models[model]
-        if len(model_setting.endpoints) == 0:
+        backend_setting = settings.get_backend(BackendType.Gemini).models[model]
+        if len(backend_setting.endpoints) == 0:
             return len(get_gpt_35_encoding().encode(text))
-        endpoint_id = model_setting.endpoints[0]
+        endpoint_id = backend_setting.endpoints[0]
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)
@@ -200,7 +200,7 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
             if endpoint.api_base
             else "https://generativelanguage.googleapis.com/v1beta"
         )
-        base_url = f"{api_base}/models/{model_setting.id}:countTokens"
+        base_url = f"{api_base}/models/{backend_setting.id}:countTokens"
         params = {"key": endpoint.api_key}
         request_body = {
             "contents": {
@@ -222,8 +222,8 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         result = response.json()
         return result["totalTokens"]
     elif model.startswith("claude"):
-        backend_settings = settings.get_backend(BackendType.Anthropic)
-        for endpoint_choice in backend_settings.models[model].endpoints:
+        backend_setting = settings.get_backend(BackendType.Anthropic)
+        for endpoint_choice in backend_setting.models[model].endpoints:
             if isinstance(endpoint_choice, dict):
                 endpoint_id = endpoint_choice["endpoint_id"]
             else:
@@ -255,10 +255,10 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         qwen_tokenizer = get_tokenizer(model)
         return len(qwen_tokenizer.encode(text))
     elif model.startswith("stepfun"):
-        model_setting = settings.moonshot.models[model]
-        if len(model_setting.endpoints) == 0:
+        backend_setting = settings.get_backend(BackendType.StepFun).models[model]
+        if len(backend_setting.endpoints) == 0:
             return len(get_gpt_35_encoding().encode(text))
-        endpoint_id = model_setting.endpoints[0]
+        endpoint_id = backend_setting.endpoints[0]
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)
@@ -282,10 +282,10 @@ def get_token_counts(text: str | dict, model: str = "", use_token_server_first:
         result = response.json()
         return result["data"]["total_tokens"]
     elif model.startswith("glm"):
-        model_setting = settings.zhipuai.models[model]
-        if len(model_setting.endpoints) == 0:
+        backend_setting = settings.get_backend(BackendType.ZhiPuAI).models[model]
+        if len(backend_setting.endpoints) == 0:
             return len(get_gpt_35_encoding().encode(text))
-        endpoint_id = model_setting.endpoints[0]
+        endpoint_id = backend_setting.endpoints[0]
         if isinstance(endpoint_id, dict):
             endpoint_id = endpoint_id["endpoint_id"]
         endpoint = settings.get_endpoint(endpoint_id)

vectorvein/settings/__init__.py

@@ -209,5 +209,52 @@ class Settings(BaseModel):
         else:
             return super().model_dump(exclude={"backends"})
 
+    def upgrade_to_v2(self) -> "Settings":
+        """
+        Upgrade settings from v1 format to v2 format.
+        In v2 format, all backend settings are stored in the 'backends' field.
+
+        Returns:
+            Settings: Self with updated format
+        """
+        # If already v2, no need to upgrade
+        if self.VERSION == "2" and self.backends is not None:
+            return self
+
+        # Initialize backends if not exists
+        if self.backends is None:
+            self.backends = Backends()
+
+        # Move all backend settings to backends field
+        backend_names = [
+            "anthropic",
+            "deepseek",
+            "gemini",
+            "groq",
+            "local",
+            "minimax",
+            "mistral",
+            "moonshot",
+            "openai",
+            "qwen",
+            "yi",
+            "zhipuai",
+            "baichuan",
+            "stepfun",
+            "xai",
+            "ernie",
+        ]
+
+        for backend_name in backend_names:
+            backend_setting = getattr(self, backend_name)
+            if backend_setting is not None:
+                setattr(self.backends, backend_name, backend_setting)
+                delattr(self, backend_name)
+
+        # Set version to 2
+        self.VERSION = "2"
+
+        return self
+
 
 settings = Settings()

{vectorvein-0.2.19.dist-info → vectorvein-0.2.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vectorvein
-Version: 0.2.19
+Version: 0.2.21
 Summary: VectorVein Python SDK
 Author-Email: Anderson <andersonby@163.com>
 License: MIT

{vectorvein-0.2.19.dist-info → vectorvein-0.2.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
-vectorvein-0.2.19.dist-info/METADATA,sha256=YqX5NXbVy5wddHOOcIK3m3hadOVLutLxvjigyxNbP9E,4414
-vectorvein-0.2.19.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-vectorvein-0.2.19.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+vectorvein-0.2.21.dist-info/METADATA,sha256=_UPhTjcys4IEhO-QgpwbPUzN8Ty0k4uCZ4Yz-eUQu5o,4414
+vectorvein-0.2.21.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+vectorvein-0.2.21.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
 vectorvein/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/api/__init__.py,sha256=lfY-XA46fgD2iIZTU0VYP8i07AwA03Egj4Qua0vUKrQ,738
 vectorvein/api/client.py,sha256=xF-leKDQzVyyy9FnIRaz0k4eElYW1XbbzeRLcpnyk90,33047
@@ -23,13 +23,13 @@ vectorvein/chat_clients/openai_compatible_client.py,sha256=L8SXCRA7OO_eXh6b-oya8
 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=r8tlt-suUjISSRjc_tCCcBYmQT3zng1YFVnQgeAG1Co,25041
+vectorvein/chat_clients/utils.py,sha256=sXqp-RAxCeNmNoh3SKptPoYqS0ZNb_y2Eemuz919IJk,25195
 vectorvein/chat_clients/xai_client.py,sha256=eLFJJrNRJ-ni3DpshODcr3S1EJQLbhVwxyO1E54LaqM,491
 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=36F9PKSNOX8ZtYBXY_l-76GQTpUSmQ2Y8EMy1H7wtdQ,1353
-vectorvein/settings/__init__.py,sha256=1KHgIF3hAXFMHlNZcgB4IcQg9iRy9WMh0BZUcBq5dGI,9509
+vectorvein/settings/__init__.py,sha256=fqOfdTZ_b1P1Mx_6rFOUkgaSqS06hvrjzIQArRUPjU0,10849
 vectorvein/settings/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vectorvein/types/__init__.py,sha256=DJYGhlshgUQgzXPfMfKW5sTpBClZUCLhqmCqF44lVuU,3329
 vectorvein/types/defaults.py,sha256=wNPrfYDwsXMNIxofgGdN-ix9-by6WQu3cGIRySl3Q2E,27350
@@ -62,4 +62,4 @@ vectorvein/workflow/nodes/vector_db.py,sha256=t6I17q6iR3yQreiDHpRrksMdWDPIvgqJs0
 vectorvein/workflow/nodes/video_generation.py,sha256=qmdg-t_idpxq1veukd-jv_ChICMOoInKxprV9Z4Vi2w,4118
 vectorvein/workflow/nodes/web_crawlers.py,sha256=LsqomfXfqrXfHJDO1cl0Ox48f4St7X_SL12DSbAMSOw,5415
 vectorvein/workflow/utils/json_to_code.py,sha256=F7dhDy8kGc8ndOeihGLRLGFGlquoxVlb02ENtxnQ0C8,5914
-vectorvein-0.2.19.dist-info/RECORD,,
+vectorvein-0.2.21.dist-info/RECORD,,