vanna 0.7.7__py3-none-any.whl → 0.7.9__py3-none-any.whl

vanna/base/base.py

@@ -181,30 +181,47 @@ class VannaBase(ABC):
             str: The extracted SQL query.
         """
 
-        # If the llm_response contains a CTE (with clause), extract the last sql between WITH and ;
-        sqls = re.findall(r"\bWITH\b .*?;", llm_response, re.DOTALL)
+        import re
+        """
+        Extracts the SQL query from the LLM response, handling various formats including:
+        - WITH clause
+        - SELECT statement
+        - CREATE TABLE AS SELECT
+        - Markdown code blocks
+        """
+
+        # Match CREATE TABLE ... AS SELECT
+        sqls = re.findall(r"\bCREATE\s+TABLE\b.*?\bAS\b.*?;", llm_response, re.DOTALL | re.IGNORECASE)
         if sqls:
             sql = sqls[-1]
             self.log(title="Extracted SQL", message=f"{sql}")
             return sql
 
-        # If the llm_response is not markdown formatted, extract last sql by finding select and ; in the response
-        sqls = re.findall(r"SELECT.*?;", llm_response, re.DOTALL)
+        # Match WITH clause (CTEs)
+        sqls = re.findall(r"\bWITH\b .*?;", llm_response, re.DOTALL | re.IGNORECASE)
         if sqls:
             sql = sqls[-1]
             self.log(title="Extracted SQL", message=f"{sql}")
             return sql
 
-        # If the llm_response contains a markdown code block, with or without the sql tag, extract the last sql from it
-        sqls = re.findall(r"```sql\n(.*)```", llm_response, re.DOTALL)
+        # Match SELECT ... ;
+        sqls = re.findall(r"\bSELECT\b .*?;", llm_response, re.DOTALL | re.IGNORECASE)
         if sqls:
             sql = sqls[-1]
             self.log(title="Extracted SQL", message=f"{sql}")
             return sql
 
-        sqls = re.findall(r"```(.*)```", llm_response, re.DOTALL)
+        # Match ```sql ... ``` blocks
+        sqls = re.findall(r"```sql\s*\n(.*?)```", llm_response, re.DOTALL | re.IGNORECASE)
         if sqls:
-            sql = sqls[-1]
+            sql = sqls[-1].strip()
+            self.log(title="Extracted SQL", message=f"{sql}")
+            return sql
+
+        # Match any ``` ... ``` code blocks
+        sqls = re.findall(r"```(.*?)```", llm_response, re.DOTALL | re.IGNORECASE)
+        if sqls:
+            sql = sqls[-1].strip()
             self.log(title="Extracted SQL", message=f"{sql}")
             return sql
 

vanna/pinecone/pinecone_vector.py

@@ -111,7 +111,7 @@ class PineconeDB_VectorStore(VannaBase):
 
     def _check_if_embedding_exists(self, id: str, namespace: str) -> bool:
         fetch_response = self.Index.fetch(ids=[id], namespace=namespace)
-        if fetch_response["vectors"] == {}:
+        if fetch_response.vectors == {}:
             return False
         return True
 

{vanna-0.7.7.dist-info → vanna-0.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vanna
-Version: 0.7.7
+Version: 0.7.9
 Summary: Generate SQL queries from natural language
 Author-email: Zain Hoda <zain@vanna.ai>
 Requires-Python: >=3.9
@@ -28,7 +28,7 @@ Requires-Dist: duckdb ; extra == "all"
 Requires-Dist: openai ; extra == "all"
 Requires-Dist: qianfan ; extra == "all"
 Requires-Dist: mistralai>=1.0.0 ; extra == "all"
-Requires-Dist: chromadb ; extra == "all"
+Requires-Dist: chromadb<1.0.0 ; extra == "all"
 Requires-Dist: anthropic ; extra == "all"
 Requires-Dist: zhipuai ; extra == "all"
 Requires-Dist: marqo ; extra == "all"
@@ -64,7 +64,7 @@ Requires-Dist: fastembed ; extra == "azuresearch"
 Requires-Dist: boto3 ; extra == "bedrock"
 Requires-Dist: botocore ; extra == "bedrock"
 Requires-Dist: google-cloud-bigquery ; extra == "bigquery"
-Requires-Dist: chromadb ; extra == "chromadb"
+Requires-Dist: chromadb<1.0.0 ; extra == "chromadb"
 Requires-Dist: clickhouse_connect ; extra == "clickhouse"
 Requires-Dist: duckdb ; extra == "duckdb"
 Requires-Dist: faiss-cpu ; extra == "faiss-cpu"
@@ -85,7 +85,7 @@ Requires-Dist: opensearch-dsl ; extra == "opensearch"
 Requires-Dist: langchain-community ; extra == "opensearch"
 Requires-Dist: langchain-huggingface ; extra == "opensearch"
 Requires-Dist: oracledb ; extra == "oracle"
-Requires-Dist: chromadb ; extra == "oracle"
+Requires-Dist: chromadb<1.0.0 ; extra == "oracle"
 Requires-Dist: langchain-postgres>=0.0.12 ; extra == "pgvector"
 Requires-Dist: pinecone ; extra == "pinecone"
 Requires-Dist: fastembed ; extra == "pinecone"

{vanna-0.7.7.dist-info → vanna-0.7.9.dist-info}/RECORD

@@ -11,7 +11,7 @@ vanna/anthropic/anthropic_chat.py,sha256=7X3x8SYwDY28aGyBnt0YNRMG8YY1p_t-foMfKGj
 vanna/azuresearch/__init__.py,sha256=tZfvsrCJESiL3EnxA4PrOc5NoO8MXEzCfHX_hnj8n-c,58
 vanna/azuresearch/azuresearch_vector.py,sha256=_-t53PUnJM914GYbTYlyee06ocfu7l2NkZerBQtlJcs,9566
 vanna/base/__init__.py,sha256=Sl-HM1RRYzAZoSqmL1CZQmF3ZF-byYTCFQP3JZ2A5MU,28
-vanna/base/base.py,sha256=dGSOuidPBCUOuKxCJ9U_B9qSQ7w5Y4XIM0olox9RCYY,73816
+vanna/base/base.py,sha256=HKb6j1jhJmJ8h5fe0t7h-KEVn_5lDg1mA3W2dqViuw8,74240
 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
@@ -55,7 +55,7 @@ vanna/oracle/oracle_vector.py,sha256=uWcDFs5uhdKdjdEhFXy4RouTOiS-XMFmaUFuuOLtqho
 vanna/pgvector/__init__.py,sha256=7Wvu9qcNdNvZu26Dn53jhO9YXELm0_YsrwBab4BdgVM,37
 vanna/pgvector/pgvector.py,sha256=dJfm8rswYZvbaIbnjmyRjL071iw4siE0INibsZtaLXY,9919
 vanna/pinecone/__init__.py,sha256=eO5l8aX8vKL6aIUMgAXGPt1jdqKxB_Hic6cmoVAUrD0,90
-vanna/pinecone/pinecone_vector.py,sha256=mpq1lzo3KRj2QfJEw8pwFclFQK1Oi_Nx-lDkx9Gp0mw,11448
+vanna/pinecone/pinecone_vector.py,sha256=DWJ6USFSGfcFQWC4X9viJddtahAUcDmYq8jrzetB1VE,11445
 vanna/qdrant/__init__.py,sha256=PX_OsDOiPMvwCJ2iGER1drSdQ9AyM8iN5PEBhRb6qqY,73
 vanna/qdrant/qdrant.py,sha256=Acl_jN-ZrtoQav_G3FuKypXiuYSo_hlP5lyOOwTxCWM,12527
 vanna/qianfan/Qianfan_Chat.py,sha256=Z-s9MwH22T4KMR8AViAjms6qoj67pHeQkMsbK-aXf1M,5273
@@ -73,7 +73,7 @@ vanna/weaviate/__init__.py,sha256=HL6PAl7ePBAkeG8uln-BmM7IUtWohyTPvDfcPzSGSCg,46
 vanna/weaviate/weaviate_vector.py,sha256=tUJIZjEy2mda8CB6C8zeN2SKkEO-UJdLsIqy69skuF0,7584
 vanna/xinference/__init__.py,sha256=EFW_sz-BSB2XgmjACOTZmneeIk3I2EiWgue-VVJpnB0,35
 vanna/xinference/xinference.py,sha256=2PI-f7XoBUyL_jfuXPqxCsd0W72h8j6CtEDneFw1AtI,1876
-vanna-0.7.7.dist-info/licenses/LICENSE,sha256=VYiPMMDqj9BcxUkAYqrAzJpn5tCFXCrnglfRqS5l9Rk,1065
-vanna-0.7.7.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-vanna-0.7.7.dist-info/METADATA,sha256=45kbhCcgYmsi7bDQESvhAwPg96c92NW6qwlIDouIpiQ,15608
-vanna-0.7.7.dist-info/RECORD,,
+vanna-0.7.9.dist-info/licenses/LICENSE,sha256=VYiPMMDqj9BcxUkAYqrAzJpn5tCFXCrnglfRqS5l9Rk,1065
+vanna-0.7.9.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+vanna-0.7.9.dist-info/METADATA,sha256=m92ZX8HYX5y5cZTaAtOaw6PRCbf_6JuNnNso5B89MPo,15626
+vanna-0.7.9.dist-info/RECORD,,