Merge branch 'main' into feat/plugin

api/configs/feature/__init__.py

@@ -23,6 +23,7 @@ class SecurityConfig(BaseSettings):
         default=24,
     )
 
+
 class AppExecutionConfig(BaseSettings):
     """
     App Execution configs
@@ -418,7 +419,6 @@ class DataSetConfig(BaseSettings):
         default=False,
     )
 
-
 class WorkspaceConfig(BaseSettings):
     """
     Workspace configs
@@ -448,6 +448,13 @@ class ImageFormatConfig(BaseSettings):
     )
 
 
+class CeleryBeatConfig(BaseSettings):
+    CELERY_BEAT_SCHEDULER_TIME: int = Field(
+        description='the time of the celery scheduler, default to 1 day',
+        default=1,
+    )
+
+
 class FeatureConfig(
     # place the configs in alphabet order
     AppExecutionConfig,
@@ -476,5 +483,6 @@ class FeatureConfig(
 
     # hosted services config
     HostedServiceConfig,
+    CeleryBeatConfig,
 ):
     pass

api/configs/feature/hosted_service/__init__.py

@@ -79,7 +79,7 @@ class HostedAzureOpenAiConfig(BaseSettings):
         default=False,
     )
 
-    HOSTED_OPENAI_API_KEY: Optional[str] = Field(
+    HOSTED_AZURE_OPENAI_API_KEY: Optional[str] = Field(
         description='',
         default=None,
     )

api/configs/middleware/__init__.py

@@ -1,4 +1,5 @@
 from typing import Any, Optional
+from urllib.parse import quote_plus
 
 from pydantic import Field, NonNegativeInt, PositiveInt, computed_field
 from pydantic_settings import BaseSettings
@@ -104,7 +105,7 @@ class DatabaseConfig:
         ).strip("&")
         db_extras = f"?{db_extras}" if db_extras else ""
         return (f"{self.SQLALCHEMY_DATABASE_URI_SCHEME}://"
-                f"{self.DB_USERNAME}:{self.DB_PASSWORD}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}"
+                f"{quote_plus(self.DB_USERNAME)}:{quote_plus(self.DB_PASSWORD)}@{self.DB_HOST}:{self.DB_PORT}/{self.DB_DATABASE}" 
                 f"{db_extras}")
 
     SQLALCHEMY_POOL_SIZE: NonNegativeInt = Field(

api/configs/middleware/vdb/myscale_config.py

@@ -1,4 +1,3 @@
-from typing import Optional
 
 from pydantic import BaseModel, Field, PositiveInt
 
@@ -8,32 +7,32 @@ class MyScaleConfig(BaseModel):
     MyScale configs
     """
 
-    MYSCALE_HOST: Optional[str] = Field(
+    MYSCALE_HOST: str = Field(
         description='MyScale host',
-        default=None,
+        default='localhost',
     )
 
-    MYSCALE_PORT: Optional[PositiveInt] = Field(
+    MYSCALE_PORT: PositiveInt = Field(
         description='MyScale port',
         default=8123,
     )
 
-    MYSCALE_USER: Optional[str] = Field(
+    MYSCALE_USER: str = Field(
         description='MyScale user',
-        default=None,
+        default='default',
     )
 
-    MYSCALE_PASSWORD: Optional[str] = Field(
+    MYSCALE_PASSWORD: str = Field(
         description='MyScale password',
-        default=None,
+        default='',
     )
 
-    MYSCALE_DATABASE: Optional[str] = Field(
+    MYSCALE_DATABASE: str = Field(
         description='MyScale database name',
-        default=None,
+        default='default',
     )
 
-    MYSCALE_FTS_PARAMS: Optional[str] = Field(
+    MYSCALE_FTS_PARAMS: str = Field(
         description='MyScale fts index parameters',
-        default=None,
+        default='',
     )

api/configs/packaging/__init__.py

@@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):
 
     CURRENT_VERSION: str = Field(
         description='Dify version',
-        default='0.6.13',
+        default='0.6.15',
     )
 
     COMMIT_SHA: str = Field(