Merge branch 'main' into bugfix/multiple_table_selection

Canner · Jul 10, 2024 · 2f5db00 · 2f5db00
2 parents 81bc711 + 969bdce
commit 2f5db00
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/deployment/kustomizations/base/cm.yaml b/deployment/kustomizations/base/cm.yaml
@@ -13,9 +13,9 @@ data:
   WREN_UI_ENDPOINT: http://wren-ui-svc:3000
 
   #Release version used by wren ui https://github.com/Canner/WrenAI/blob/main/docker/docker-compose.yaml#L85-L88
-  WREN_PRODUCT_VERSION: "0.7.0"
+  WREN_PRODUCT_VERSION: "0.7.1-rc.1"
   WREN_ENGINE_VERSION: "0.7.0"
-  WREN_AI_SERVICE_VERSION: "0.7.0"
+  WREN_AI_SERVICE_VERSION: "0.7.1"
   WREN_UI_VERSION: "0.10.0"
 
   # OpenAI

diff --git a/deployment/kustomizations/patches/cm.yaml b/deployment/kustomizations/patches/cm.yaml
@@ -7,10 +7,10 @@
     WREN_AI_SERVICE_PORT: "5555"
 
     #Release version used by wren ui https://github.com/Canner/WrenAI/blob/main/docker/docker-compose.yaml#L85-L88
-    WREN_PRODUCT_VERSION: "0.7.0"
+    WREN_PRODUCT_VERSION: "0.7.1-rc.1"
     #fix:
     WREN_ENGINE_VERSION: "0.7.0"
-    WREN_AI_SERVICE_VERSION: "0.7.0"
+    WREN_AI_SERVICE_VERSION: "0.7.1"
     #fix:
     WREN_UI_VERSION: "0.10.0"
 

diff --git a/docker/.env.example b/docker/.env.example
@@ -20,9 +20,9 @@ GENERATION_MODEL=gpt-3.5-turbo # gpt-3.5-turbo, gpt-4o, gpt-4-turbo
 
 # version
 # CHANGE THIS TO THE LATEST VERSION
-WREN_PRODUCT_VERSION=0.7.0
+WREN_PRODUCT_VERSION=0.7.1-rc.1
 WREN_ENGINE_VERSION=0.7.0
-WREN_AI_SERVICE_VERSION=0.7.0
+WREN_AI_SERVICE_VERSION=0.7.1
 IBIS_SERVER_VERSION=0.7.0
 WREN_UI_VERSION=0.10.0
 WREN_BOOTSTRAP_VERSION=0.1.4

diff --git a/wren-ai-service/entrypoint.sh b/wren-ai-service/entrypoint.sh
@@ -12,7 +12,7 @@ done
 
 echo "wren-ai-service has started."
 
-python src/force_deploy.py
+python -m src.force_deploy
 
 # Bring wren-ai-service to the foreground
 wait
diff --git a/wren-ai-service/pyproject.toml b/wren-ai-service/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wren-ai-service"
-version = "0.7.0"
+version = "0.7.2"
 description = ""
 authors = ["Jimmy Yeh <[email protected]>", "Pao Sheng Wang <[email protected]>", "Aster Sun <[email protected]>"]
 license = "AGPL-3.0"

diff --git a/wren-ai-service/src/providers/embedder/azure_openai.py b/wren-ai-service/src/providers/embedder/azure_openai.py
@@ -49,6 +49,7 @@ def __init__(
 
         self.client = AsyncAzureOpenAI(
             azure_endpoint=api_base_url,
+            azure_deployment=model,
             api_version=api_version,
             api_key=api_key.resolve_value(),
         )

diff --git a/wren-ai-service/src/providers/engine/wren.py b/wren-ai-service/src/providers/engine/wren.py
@@ -59,7 +59,7 @@ async def dry_run_sql(
         },
     ) -> Tuple[bool, Optional[Dict[str, Any]]]:
         async with session.post(
-            f"{self._endpoint}/v2/ibis/{properties.get('source', '')}/query?dryRun=true",
+            f"{self._endpoint}/v2/connector/{properties.get('source', '')}/query?dryRun=true",
             json={
                 "sql": remove_limit_statement(add_quotes(sql)),
                 "manifestStr": properties.get("manifest", ""),

diff --git a/wren-ai-service/src/utils.py b/wren-ai-service/src/utils.py
@@ -126,6 +126,14 @@ def remove_trailing_slash(endpoint: str) -> str:
 
 def init_langfuse():
     enabled = os.getenv("LANGFUSE_ENABLE", "false")
+    host = os.getenv("LANGFUSE_HOST", "https://cloud.langfuse.com")
+
     langfuse_context.configure(
         enabled=False if enabled.lower() == "false" else True,
+        public_key=os.getenv("LANGFUSE_PUBLIC_KEY", ""),
+        secret_key=os.getenv("LANGFUSE_SECRET_KEY", ""),
+        host=host,
     )
+
+    logger.info(f"LANGFUSE_ENABLE: {enabled}")
+    logger.info(f"LANGFUSE_HOST: {host}")
diff --git a/wren-launcher/utils/docker.go b/wren-launcher/utils/docker.go
@@ -24,7 +24,7 @@ import (
 
 const (
 	// please change the version when the version is updated
-	WREN_PRODUCT_VERSION        string = "0.7.0"
+	WREN_PRODUCT_VERSION        string = "0.7.1-rc.1"
 	DOCKER_COMPOSE_YAML_URL     string = "https://raw.githubusercontent.com/Canner/WrenAI/" + WREN_PRODUCT_VERSION + "/docker/docker-compose.yaml"
 	DOCKER_COMPOSE_LLM_YAML_URL string = "https://raw.githubusercontent.com/Canner/WrenAI/" + WREN_PRODUCT_VERSION + "/docker/docker-compose.llm.yaml"
 	DOCKER_COMPOSE_ENV_URL      string = "https://raw.githubusercontent.com/Canner/WrenAI/" + WREN_PRODUCT_VERSION + "/docker/.env.example"