vanna 0.6.6__py3-none-any.whl → 0.7.1__py3-none-any.whl

vanna/ollama/ollama.py

@@ -27,7 +27,9 @@ class Ollama(VannaBase):
     if ":" not in self.model:
       self.model += ":latest"
 
-    self.ollama_client = ollama.Client(self.host, timeout=Timeout(240.0))
+    self.ollama_timeout = config.get("ollama_timeout", 240.0)
+
+    self.ollama_client = ollama.Client(self.host, timeout=Timeout(self.ollama_timeout))
     self.keep_alive = config.get('keep_alive', None)
     self.ollama_options = config.get('options', {})
     self.num_ctx = self.ollama_options.get('num_ctx', 2048)

vanna/qianwen/QianwenAI_chat.py

@@ -0,0 +1,133 @@
+import os
+
+from openai import OpenAI
+
+from ..base import VannaBase
+
+
+class QianWenAI_Chat(VannaBase):
+  def __init__(self, client=None, config=None):
+    VannaBase.__init__(self, config=config)
+
+    # default parameters - can be overrided using config
+    self.temperature = 0.7
+
+    if "temperature" in config:
+      self.temperature = config["temperature"]
+
+    if "api_type" in config:
+      raise Exception(
+        "Passing api_type is now deprecated. Please pass an OpenAI client instead."
+      )
+
+    if "api_base" in config:
+      raise Exception(
+        "Passing api_base is now deprecated. Please pass an OpenAI client instead."
+      )
+
+    if "api_version" in config:
+      raise Exception(
+        "Passing api_version is now deprecated. Please pass an OpenAI client instead."
+      )
+
+    if client is not None:
+      self.client = client
+      return
+
+    if config is None and client is None:
+      self.client = OpenAI(api_key=os.getenv("OPENAI_API_KEY"))
+      return
+
+    if "api_key" in config:
+      if "base_url" not in config:
+        self.client = OpenAI(api_key=config["api_key"],
+                             base_url="https://dashscope.aliyuncs.com/compatible-mode/v1")
+      else:
+        self.client = OpenAI(api_key=config["api_key"],
+                             base_url=config["base_url"])
+
+  def system_message(self, message: str) -> any:
+    return {"role": "system", "content": message}
+
+  def user_message(self, message: str) -> any:
+    return {"role": "user", "content": message}
+
+  def assistant_message(self, message: str) -> any:
+    return {"role": "assistant", "content": message}
+
+  def submit_prompt(self, prompt, **kwargs) -> str:
+    if prompt is None:
+      raise Exception("Prompt is None")
+
+    if len(prompt) == 0:
+      raise Exception("Prompt is empty")
+
+    # Count the number of tokens in the message log
+    # Use 4 as an approximation for the number of characters per token
+    num_tokens = 0
+    for message in prompt:
+      num_tokens += len(message["content"]) / 4
+
+    if kwargs.get("model", None) is not None:
+      model = kwargs.get("model", None)
+      print(
+        f"Using model {model} for {num_tokens} tokens (approx)"
+      )
+      response = self.client.chat.completions.create(
+        model=model,
+        messages=prompt,
+        stop=None,
+        temperature=self.temperature,
+      )
+    elif kwargs.get("engine", None) is not None:
+      engine = kwargs.get("engine", None)
+      print(
+        f"Using model {engine} for {num_tokens} tokens (approx)"
+      )
+      response = self.client.chat.completions.create(
+        engine=engine,
+        messages=prompt,
+        stop=None,
+        temperature=self.temperature,
+      )
+    elif self.config is not None and "engine" in self.config:
+      print(
+        f"Using engine {self.config['engine']} for {num_tokens} tokens (approx)"
+      )
+      response = self.client.chat.completions.create(
+        engine=self.config["engine"],
+        messages=prompt,
+        stop=None,
+        temperature=self.temperature,
+      )
+    elif self.config is not None and "model" in self.config:
+      print(
+        f"Using model {self.config['model']} for {num_tokens} tokens (approx)"
+      )
+      response = self.client.chat.completions.create(
+        model=self.config["model"],
+        messages=prompt,
+        stop=None,
+        temperature=self.temperature,
+      )
+    else:
+      if num_tokens > 3500:
+        model = "qwen-long"
+      else:
+        model = "qwen-plus"
+
+      print(f"Using model {model} for {num_tokens} tokens (approx)")
+      response = self.client.chat.completions.create(
+        model=model,
+        messages=prompt,
+        stop=None,
+        temperature=self.temperature,
+      )
+
+    # Find the first response from the chatbot that has text in it (some responses may not have text)
+    for choice in response.choices:
+      if "text" in choice:
+        return choice.text
+
+    # If no response with text is found, return the first response's content (which may be empty)
+    return response.choices[0].message.content

vanna/qianwen/QianwenAI_embeddings.py

@@ -0,0 +1,46 @@
+from openai import OpenAI
+
+from ..base import VannaBase
+
+
+class QianWenAI_Embeddings(VannaBase):
+    def __init__(self, client=None, config=None):
+        VannaBase.__init__(self, config=config)
+
+        if client is not None:
+            self.client = client
+            return
+
+        if self.client is not None:
+            return
+
+        self.client = OpenAI()
+
+        if config is None:
+            return
+
+        if "api_type" in config:
+            self.client.api_type = config["api_type"]
+
+        if "api_base" in config:
+            self.client.api_base = config["api_base"]
+
+        if "api_version" in config:
+            self.client.api_version = config["api_version"]
+
+        if "api_key" in config:
+            self.client.api_key = config["api_key"]
+
+    def generate_embedding(self, data: str, **kwargs) -> list[float]:
+        if self.config is not None and "engine" in self.config:
+            embedding = self.client.embeddings.create(
+                engine=self.config["engine"],
+                input=data,
+            )
+        else:
+            embedding = self.client.embeddings.create(
+                model="bge-large-zh",
+                input=data,
+            )
+
+        return embedding.get("data")[0]["embedding"]

vanna/qianwen/__init__.py

@@ -0,0 +1,2 @@
+from .QianwenAI_chat import QianWenAI_Chat
+from .QianwenAI_embeddings import QianWenAI_Embeddings

vanna/weaviate/weaviate_vector.py

@@ -26,6 +26,7 @@ class WeaviateDatabase(VannaBase):
         if config is None:
             raise ValueError("config is required")
 
+        self.n_results = config.get("n_results", 3)
         self.fastembed_model = config.get("fastembed_model", "BAAI/bge-small-en-v1.5")
         self.weaviate_api_key = config.get("weaviate_api_key")
         self.weaviate_url = config.get("weaviate_url")
@@ -120,12 +121,12 @@ class WeaviateDatabase(VannaBase):
         response = self._insert_data('sql', data_object, self.generate_embedding(question))
         return f'{response}-sql'
 
-    def _query_collection(self, cluster_key: str, vector_input: list, return_properties: list, limit: int = 3) -> list:
+    def _query_collection(self, cluster_key: str, vector_input: list, return_properties: list) -> list:
         self.weaviate_client.connect()
         collection = self.weaviate_client.collections.get(self.training_data_cluster[cluster_key])
         response = collection.query.near_vector(
             near_vector=vector_input,
-            limit=limit,
+            limit=self.n_results,
             return_properties=return_properties
         )
         response_list = [item.properties for item in response.objects]

{vanna-0.6.6.dist-info → vanna-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vanna
-Version: 0.6.6
+Version: 0.7.1
 Summary: Generate SQL queries from natural language
 Author-email: Zain Hoda <zain@vanna.ai>
 Requires-Python: >=3.9
@@ -43,7 +43,14 @@ Requires-Dist: transformers ; extra == "all"
 Requires-Dist: pinecone-client ; extra == "all"
 Requires-Dist: pymilvus[model] ; extra == "all"
 Requires-Dist: weaviate-client ; extra == "all"
+Requires-Dist: azure-search-documents ; extra == "all"
+Requires-Dist: azure-identity ; extra == "all"
+Requires-Dist: azure-common ; extra == "all"
 Requires-Dist: anthropic ; extra == "anthropic"
+Requires-Dist: azure-search-documents ; extra == "azuresearch"
+Requires-Dist: azure-identity ; extra == "azuresearch"
+Requires-Dist: azure-common ; extra == "azuresearch"
+Requires-Dist: fastembed ; extra == "azuresearch"
 Requires-Dist: boto3 ; extra == "bedrock"
 Requires-Dist: botocore ; extra == "bedrock"
 Requires-Dist: google-cloud-bigquery ; extra == "bigquery"
@@ -79,6 +86,7 @@ Project-URL: Bug Tracker, https://github.com/vanna-ai/vanna/issues
 Project-URL: Homepage, https://github.com/vanna-ai/vanna
 Provides-Extra: all
 Provides-Extra: anthropic
+Provides-Extra: azuresearch
 Provides-Extra: bedrock
 Provides-Extra: bigquery
 Provides-Extra: chromadb

{vanna-0.6.6.dist-info → vanna-0.7.1.dist-info}/RECORD

@@ -8,15 +8,17 @@ vanna/ZhipuAI/__init__.py,sha256=NlsijtcZp5Tj9jkOe9fNcOQND_QsGgu7otODsCLBPr0,116
 vanna/advanced/__init__.py,sha256=oDj9g1JbrbCfp4WWdlr_bhgdMqNleyHgr6VXX6DcEbo,658
 vanna/anthropic/__init__.py,sha256=85s_2mAyyPxc0T_0JEvYeAkEKWJwkwqoyUwSC5dw9Gk,43
 vanna/anthropic/anthropic_chat.py,sha256=7X3x8SYwDY28aGyBnt0YNRMG8YY1p_t-foMfKGj8_Oo,2627
+vanna/azuresearch/__init__.py,sha256=tZfvsrCJESiL3EnxA4PrOc5NoO8MXEzCfHX_hnj8n-c,58
+vanna/azuresearch/azuresearch_vector.py,sha256=fc7w_bE6IgOsWb1vkA8t8k-AtuzLyH6zlW4ej4d2lE8,9558
 vanna/base/__init__.py,sha256=Sl-HM1RRYzAZoSqmL1CZQmF3ZF-byYTCFQP3JZ2A5MU,28
-vanna/base/base.py,sha256=DrXaJcMhIjD6BEqLu4JNZaZZ8nTM4SppjdvueJjEcko,71463
+vanna/base/base.py,sha256=j5xQmK-MeFKAuPjgYLSl1ThCHZieG-ab-RFFSkDlbiw,73679
 vanna/bedrock/__init__.py,sha256=hRT2bgJbHEqViLdL-t9hfjSfFdIOkPU2ADBt-B1En-8,46
 vanna/bedrock/bedrock_converse.py,sha256=Nx5kYm-diAfYmsWAnTP5xnv7V84Og69-AP9b3seIe0E,2869
 vanna/chromadb/__init__.py,sha256=-iL0nW_g4uM8nWKMuWnNePfN4nb9uk8P3WzGvezOqRg,50
 vanna/chromadb/chromadb_vector.py,sha256=eKyPck99Y6Jt-BNWojvxLG-zvAERzLSm-3zY-bKXvaA,8792
 vanna/exceptions/__init__.py,sha256=dJ65xxxZh1lqBeg6nz6Tq_r34jLVmjvBvPO9Q6hFaQ8,685
-vanna/flask/__init__.py,sha256=cllLWqJ2SYVdvF4CQ-8cipoOdjgkoe0rChWnawtzMyA,42921
-vanna/flask/assets.py,sha256=_UoUr57sS0QL2BuTxAOe9k4yy8T7-fp2NpbRSVtW3IM,451769
+vanna/flask/__init__.py,sha256=jcdaau1tQ142nL1ZsDklk0ilMkEyRxgQZdmsl1IN4LQ,43866
+vanna/flask/assets.py,sha256=af-vact_5HSftltugBpPxzLkAI14Z0lVWcObyVe6eKE,453462
 vanna/flask/auth.py,sha256=UpKxh7W5cd43W0LGch0VqhncKwB78L6dtOQkl1JY5T0,1246
 vanna/google/__init__.py,sha256=6D8rDBjKJJm_jpVn9b4Vc2NR-R779ed_bnHhWmxCJXE,92
 vanna/google/bigquery_vector.py,sha256=rkP94Xd1lNYjU1x3MDLvqmGSPUYtDfQwvlqVmX44jyM,8839
@@ -34,7 +36,7 @@ vanna/mock/embedding.py,sha256=ggnP7KuPh6dlqeUFtoN8t0J0P7_yRNtn9rIq6h8g8-w,250
 vanna/mock/llm.py,sha256=WpG9f1pKZftPBHqgIYdARKB2Z9DZhOALYOJWoOjjFEc,518
 vanna/mock/vectordb.py,sha256=h45znfYMUnttE2BBC8v6TKeMaA58pFJL-5B3OGeRNFI,2681
 vanna/ollama/__init__.py,sha256=4xyu8aHPdnEHg5a-QAMwr5o0ns5wevsp_zkI-ndMO2k,27
-vanna/ollama/ollama.py,sha256=rXa7cfvdlO1E5SLysXIl3IZpIaA2r0RBvV5jX2-upiE,3794
+vanna/ollama/ollama.py,sha256=yD7UHn4GNzWfQMi2OHlfWwIEJ_sTDzpPcgv_MCGRp6E,3871
 vanna/openai/__init__.py,sha256=tGkeQ7wTIPsando7QhoSHehtoQVdYLwFbKNlSmCmNeQ,86
 vanna/openai/openai_chat.py,sha256=KU6ynOQ5v7vwrQQ13phXoUXeQUrH6_vmhfiPvWddTrQ,4427
 vanna/openai/openai_embeddings.py,sha256=g4pNh9LVcYP9wOoO8ecaccDFWmCUYMInebfHucAa2Gc,1260
@@ -47,13 +49,16 @@ vanna/qdrant/qdrant.py,sha256=qkTWhGrVSAngJZkrcRQ8YFVHcI9j_ZoOGbF6ZVUUdsU,12567
 vanna/qianfan/Qianfan_Chat.py,sha256=Z-s9MwH22T4KMR8AViAjms6qoj67pHeQkMsbK-aXf1M,5273
 vanna/qianfan/Qianfan_embeddings.py,sha256=TYynAJXlyuZfmoj49h8nU6bXu_GjlXREp3tgfQUca04,954
 vanna/qianfan/__init__.py,sha256=QpR43BjZQZcrcDRkyYcYiS-kyqtYmu23AHDzK0Wy1D0,90
+vanna/qianwen/QianwenAI_chat.py,sha256=c4stx4QzX-Af28c0H4h2ZDDKJknWcun0L9LevMTSHSE,4076
+vanna/qianwen/QianwenAI_embeddings.py,sha256=55cwKpB_N3OVgXkC8uSGQCaIAK8vojz2UnlANtiXWS8,1253
+vanna/qianwen/__init__.py,sha256=fBl4zQTpvObGRNJV6EVNjIUQ9aKDDYq-zLPsEZrRpwg,98
 vanna/types/__init__.py,sha256=Qhn_YscKtJh7mFPCyCDLa2K8a4ORLMGVnPpTbv9uB2U,4957
 vanna/vannadb/__init__.py,sha256=C6UkYocmO6dmzfPKZaWojN0mI5YlZZ9VIbdcquBE58A,48
 vanna/vannadb/vannadb_vector.py,sha256=N8poMYvAojoaOF5gI4STD5pZWK9lBKPvyIjbh9dPBa0,14189
 vanna/vllm/__init__.py,sha256=aNlUkF9tbURdeXAJ8ytuaaF1gYwcG3ny1MfNl_cwQYg,23
 vanna/vllm/vllm.py,sha256=oM_aA-1Chyl7T_Qc_yRKlL6oSX1etsijY9zQdjeMGMQ,2827
 vanna/weaviate/__init__.py,sha256=HL6PAl7ePBAkeG8uln-BmM7IUtWohyTPvDfcPzSGSCg,46
-vanna/weaviate/weaviate_vector.py,sha256=GEiu4Vd9w-7j10aB-zTxJ8gefqe_F-LUUGvttFs1vlg,7539
-vanna-0.6.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-vanna-0.6.6.dist-info/METADATA,sha256=_qy1wVZqQOLplCxZ43KqCIEgL0Wq2X48ekJEACq-0Ng,12011
-vanna-0.6.6.dist-info/RECORD,,
+vanna/weaviate/weaviate_vector.py,sha256=tUJIZjEy2mda8CB6C8zeN2SKkEO-UJdLsIqy69skuF0,7584
+vanna-0.7.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+vanna-0.7.1.dist-info/METADATA,sha256=3u_bTszt64VtEBVQbfmUCBvUV7OZk2df07eAhN8mZa4,12407
+vanna-0.7.1.dist-info/RECORD,,