vanna 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

vanna/base/base.py

@@ -124,6 +124,11 @@ class VannaBase(ABC):
         return self.extract_sql(llm_response)
 
     def extract_sql(self, llm_response: str) -> str:
+        # If the llm_response contains a CTE (with clause), extract the sql bewteen WITH and ;
+        sql = re.search(r"WITH.*?;", llm_response, re.DOTALL)
+        if sql:
+            self.log(f"Output from LLM: {llm_response} \nExtracted SQL: {sql.group(0)}")
+            return sql.group(0)  
         # If the llm_response is not markdown formatted, extract sql by finding select and ; in the response
         sql = re.search(r"SELECT.*?;", llm_response, re.DOTALL)
         if sql:
@@ -131,11 +136,6 @@ class VannaBase(ABC):
             )
             return sql.group(0)
 
-        # If the llm_response contains a CTE (with clause), extract the sql bewteen WITH and ;
-        sql = re.search(r"WITH.*?;", llm_response, re.DOTALL)
-        if sql:
-            self.log(f"Output from LLM: {llm_response} \nExtracted SQL: {sql.group(0)}")
-            return sql.group(0)
         # If the llm_response contains a markdown code block, with or without the sql tag, extract the sql from it
         sql = re.search(r"```sql\n(.*)```", llm_response, re.DOTALL)
         if sql:

vanna/exceptions/__init__.py

@@ -1,46 +1,46 @@
-class ImproperlyConfigured(BaseException):
+class ImproperlyConfigured(Exception):
     """Raise for incorrect configuration."""
 
     pass
 
 
-class DependencyError(BaseException):
+class DependencyError(Exception):
     """Raise for missing dependencies."""
 
     pass
 
 
-class ConnectionError(BaseException):
+class ConnectionError(Exception):
     """Raise for connection"""
 
     pass
 
 
-class OTPCodeError(BaseException):
+class OTPCodeError(Exception):
     """Raise for invalid otp or not able to send it"""
 
     pass
 
 
-class SQLRemoveError(BaseException):
+class SQLRemoveError(Exception):
     """Raise when not able to remove SQL"""
 
     pass
 
 
-class ExecutionError(BaseException):
+class ExecutionError(Exception):
     """Raise when not able to execute Code"""
 
     pass
 
 
-class ValidationError(BaseException):
+class ValidationError(Exception):
     """Raise for validations"""
 
     pass
 
 
-class APIError(BaseException):
+class APIError(Exception):
     """Raise for API errors"""
 
     pass

{vanna-0.4.1.dist-info → vanna-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vanna
-Version: 0.4.1
+Version: 0.4.3
 Summary: Generate SQL queries from natural language
 Author-email: Zain Hoda <zain@vanna.ai>
 Requires-Python: >=3.9

{vanna-0.4.1.dist-info → vanna-0.4.3.dist-info}/RECORD

@@ -8,10 +8,10 @@ vanna/ZhipuAI/__init__.py,sha256=NlsijtcZp5Tj9jkOe9fNcOQND_QsGgu7otODsCLBPr0,116
 vanna/anthropic/__init__.py,sha256=85s_2mAyyPxc0T_0JEvYeAkEKWJwkwqoyUwSC5dw9Gk,43
 vanna/anthropic/anthropic_chat.py,sha256=Wk0o-NMW1uvR2fhSWxrR_2FqNh-dLprNG4uuVqpqAkY,2615
 vanna/base/__init__.py,sha256=Sl-HM1RRYzAZoSqmL1CZQmF3ZF-byYTCFQP3JZ2A5MU,28
-vanna/base/base.py,sha256=_2vANGAcUe6IrsEhZyFnE6FdO8NMLylfyGlRI4XujWE,58143
+vanna/base/base.py,sha256=aGsswvx53XN-S7cYg874-3Ewb7iLLjus_fZ7KwHQcdw,58145
 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=N76unE7sjbGGBz6LmCrPQAugFWr9cUFv8ErJxBrCTts,717
+vanna/exceptions/__init__.py,sha256=dJ65xxxZh1lqBeg6nz6Tq_r34jLVmjvBvPO9Q6hFaQ8,685
 vanna/flask/__init__.py,sha256=5Du2oK5s-VSLicRPvxMAL1-Gh_jdX847FjJOf5AVapo,23721
 vanna/flask/assets.py,sha256=ZESgn0-XrJl4_YV69Lu7Dr7-Y9Eql7xqb7PsoMzrofw,183889
 vanna/flask/auth.py,sha256=UpKxh7W5cd43W0LGch0VqhncKwB78L6dtOQkl1JY5T0,1246
@@ -31,6 +31,6 @@ vanna/qdrant/qdrant.py,sha256=XlesB0UniR0LmiXvQ8Ct7o19EdCZPuvUgvyzYSlp94c,11940
 vanna/types/__init__.py,sha256=Qhn_YscKtJh7mFPCyCDLa2K8a4ORLMGVnPpTbv9uB2U,4957
 vanna/vannadb/__init__.py,sha256=C6UkYocmO6dmzfPKZaWojN0mI5YlZZ9VIbdcquBE58A,48
 vanna/vannadb/vannadb_vector.py,sha256=9YwTO3Lh5owWQE7KPMBqLp2EkiGV0RC1sEYhslzJzgI,6168
-vanna-0.4.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-vanna-0.4.1.dist-info/METADATA,sha256=SwU235jbylf7gJ4VwDXtz7bLhUF5uTV0IdPCnK1HH68,10512
-vanna-0.4.1.dist-info/RECORD,,
+vanna-0.4.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+vanna-0.4.3.dist-info/METADATA,sha256=mdtz7Vk3wdOzbq23jTLPmR9daOkacBhABElbus-1Kck,10512
+vanna-0.4.3.dist-info/RECORD,,