Merge branch 'main' into feature/metadata-api

Author: grieve54706

README.md

@@ -23,6 +23,16 @@
   </a>
 </p>
 
+## Wren AI @ Hacktoberfest 2024 - Oct 1 till Oct 31
+
+[Hacktoberfest 2024](https://hacktoberfest.com/) is here, and we're inviting developers of all levels to join our open-source community. Together, we'll build Wren AI as a friendly community for all. 
+
+👉 Learn how to [Win Wren AI Exclusive Swag Pack & Holopin From Digital Ocean Rewards](https://getwren.ai/wren-ai-hacktoberfest-2024)!
+
+[![image](https://github.com/user-attachments/assets/9048d701-a97b-4c6b-b3ed-fc636201f234)](https://getwren.ai/wren-ai-hacktoberfest-2024)
+
+---
+
 > Wren Engine is the semantic engine for LLMs, the backbone of the [Wren AI](https://github.com/Canner/WrenAI) project.
 
 <img src="./misc/wren_engine_flow.png">
@@ -47,7 +57,7 @@ The Wren engine aims to be compatible with composable data systems. It follows t
 - [Benefits of Wren Engine with LLMs](https://docs.getwren.ai/engine/concept/benefits_llm)
 
 ## 🚧 Project Status
-Wren Engine is currently in the alpha version. The project team is actively working on progress and aiming to release new versions at least biweekly.
+Wren Engine is currently in the beta version. The project team is actively working on progress and aiming to release new versions at least biweekly.
 
 ## ⭐️ Community
 

ibis-server/Dockerfile

@@ -3,10 +3,9 @@ FROM python:3.11-buster AS builder
 # libpq-dev is required for psycopg2
 RUN apt-get update && apt-get -y install libpq-dev
 
-# TODO: enable rust after fix the issue with the build
 # Install rust
-# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
-# ENV PATH="/root/.cargo/bin:$PATH"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
+ENV PATH="/root/.cargo/bin:$PATH"
 
 # Install justfile
 RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/bin
@@ -25,15 +24,12 @@ ENV PYTHONUNBUFFERED=1 \
 
 RUN pip install poetry==1.8.3
 
-# TODO: enable rust after fix the issue with the build
-# COPY --from=wren-modeling-py . /wren-modeling-py
-# COPY --from=wren-modeling-rs . /wren-modeling-rs
+COPY --from=wren-modeling-py . /wren-modeling-py
+COPY --from=wren-modeling-rs . /wren-modeling-rs
 
 WORKDIR /app
 COPY . .
-# TODO: enable rust after fix the issue with the build
-# RUN just install --without dev
-RUN poetry install --without dev
+RUN just install --without dev
 
 
 FROM python:3.11-slim-buster AS runtime

ibis-server/app/model/__init__.py

@@ -21,7 +21,7 @@ class QueryClickHouseDTO(QueryDTO):
 
 
 class QueryMSSqlDTO(QueryDTO):
-    connection_info: MSSqlConnectionInfo = connection_info_field
+    connection_info: ConnectionUrl | MSSqlConnectionInfo = connection_info_field
 
 
 class QueryMySqlDTO(QueryDTO):

ibis-server/app/model/data_source.py

@@ -3,7 +3,6 @@
 import base64
 from enum import Enum, StrEnum, auto
 from json import loads
-from urllib.parse import urlparse
 
 import ibis
 from google.oauth2 import service_account
@@ -13,7 +12,6 @@
     BigQueryConnectionInfo,
     ClickHouseConnectionInfo,
     ConnectionInfo,
-    ConnectionUrl,
     MSSqlConnectionInfo,
     MySqlConnectionInfo,
     PostgresConnectionInfo,
@@ -66,6 +64,8 @@ def __init__(self, dto: QueryDTO):
 
     def get_connection(self, info: ConnectionInfo) -> BaseBackend:
         try:
+            if hasattr(info, "connection_url"):
+                return ibis.connect(info.connection_url.get_secret_value())
             return getattr(self, f"get_{self.name}_connection")(info)
         except KeyError:
             raise NotImplementedError(f"Unsupported data source: {self}")
@@ -85,13 +85,7 @@ def get_bigquery_connection(info: BigQueryConnectionInfo) -> BaseBackend:
         )
 
     @staticmethod
-    def get_clickhouse_connection(
-        info: ConnectionUrl | ClickHouseConnectionInfo,
-    ) -> BaseBackend:
-        if hasattr(info, "connection_url"):
-            url = info.connection_url.get_secret_value()
-            # ibis miss port of connection url, so we need to pass it explicitly
-            return ibis.connect(url, port=urlparse(url).port)
+    def get_clickhouse_connection(info: ClickHouseConnectionInfo) -> BaseBackend:
         return ibis.clickhouse.connect(
             host=info.host.get_secret_value(),
             port=int(info.port.get_secret_value()),
@@ -102,7 +96,6 @@ def get_clickhouse_connection(
 
     @staticmethod
     def get_mssql_connection(info: MSSqlConnectionInfo) -> BaseBackend:
-        # mssql in ibis does not support connection url
         return ibis.mssql.connect(
             host=info.host.get_secret_value(),
             port=info.port.get_secret_value(),
@@ -113,13 +106,7 @@ def get_mssql_connection(info: MSSqlConnectionInfo) -> BaseBackend:
         )
 
     @staticmethod
-    def get_mysql_connection(
-        info: ConnectionUrl | MySqlConnectionInfo,
-    ) -> BaseBackend:
-        if hasattr(info, "connection_url"):
-            url = info.connection_url.get_secret_value()
-            # ibis miss port of connection url, so we need to pass it explicitly
-            return ibis.connect(url, port=urlparse(url).port)
+    def get_mysql_connection(info: MySqlConnectionInfo) -> BaseBackend:
         return ibis.mysql.connect(
             host=info.host.get_secret_value(),
             port=int(info.port.get_secret_value()),
@@ -129,11 +116,7 @@ def get_mysql_connection(
         )
 
     @staticmethod
-    def get_postgres_connection(
-        info: ConnectionUrl | PostgresConnectionInfo,
-    ) -> BaseBackend:
-        if hasattr(info, "connection_url"):
-            return ibis.connect(info.connection_url.get_secret_value())
+    def get_postgres_connection(info: PostgresConnectionInfo) -> BaseBackend:
         return ibis.postgres.connect(
             host=info.host.get_secret_value(),
             port=int(info.port.get_secret_value()),
@@ -153,11 +136,7 @@ def get_snowflake_connection(info: SnowflakeConnectionInfo) -> BaseBackend:
         )
 
     @staticmethod
-    def get_trino_connection(
-        info: ConnectionUrl | TrinoConnectionInfo,
-    ) -> BaseBackend:
-        if hasattr(info, "connection_url"):
-            return ibis.connect(info.connection_url.get_secret_value())
+    def get_trino_connection(info: TrinoConnectionInfo) -> BaseBackend:
         return ibis.trino.connect(
             host=info.host.get_secret_value(),
             port=int(info.port.get_secret_value()),

ibis-server/tests/routers/v2/connector/test_mssql.py

@@ -145,9 +145,6 @@ def test_query(mssql: SqlServerContainer):
     }
 
 
-@pytest.mark.skip(
-    reason="ibis does not support mssql using connection url, wait fix PR in ibis repo"
-)
 def test_query_with_connection_url(mssql: SqlServerContainer):
     connection_url = _to_connection_url(mssql)
     response = client.post(
@@ -385,4 +382,4 @@ def _to_connection_info(mssql: SqlServerContainer):
 
 def _to_connection_url(mssql: SqlServerContainer):
     info = _to_connection_info(mssql)
-    return f"mssql://{info['user']}:{info['password']}@{info['host']}:{info['port']}/{info['database']}"
+    return f"mssql://{info['user']}:{info['password']}@{info['host']}:{info['port']}/{info['database']}?driver=FreeTDS"