Hotfix/v2.4.0 beta1 fix (#1919)

Author: zgqgit

docker/docker-compose.yml

@@ -40,7 +40,7 @@ services:
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v2.4.0-beta1
+    image: dataelement/bisheng-backend:v2.4.0-beta1-fix
     ports:
       - "7860:7860"
     environment:
@@ -78,7 +78,7 @@ services:
 
   backend_worker:
     container_name: bisheng-backend-worker
-    image: dataelement/bisheng-backend:v2.4.0-beta1
+    image: dataelement/bisheng-backend:v2.4.0-beta1-fix
     environment:
       TZ: Asia/Shanghai
       BS_MILVUS_CONNECTION_ARGS: '{"host":"milvus","port":"19530","user":"","password":"","secure":false}'
@@ -109,7 +109,7 @@ services:
 
   frontend:
     container_name: bisheng-frontend
-    image: dataelement/bisheng-frontend:v2.4.0-beta1
+    image: dataelement/bisheng-frontend:v2.4.0-beta1-fix
     ports:
       - "3001:3001"
     environment:

src/backend/bisheng/__init__.py

@@ -7,7 +7,7 @@
 
 try:
     # SetujuciGo to automatic modification
-    __version__ = '2.4.0-beta1'
+    __version__ = '2.4.0-beta1-fix'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''

src/backend/bisheng/knowledge/domain/models/knowledge.py

@@ -47,14 +47,16 @@ def _missing_(cls, value: Any) -> Optional["MetadataFieldType"]:
 
 class KnowledgeBase(SQLModelSerializable):
     user_id: Optional[int] = Field(default=None, index=True)
-    name: str = Field(index=True, min_length=1, max_length=200, description='Knowledge Base Name, Minimum one character, maximum30characters')
-    type: int = Field(index=False, default=0, description='0 is a general knowledge base,1 areQAThe knowledge base upon')
+    name: str = Field(index=True, min_length=1, max_length=200,
+                      description='Knowledge Base Name')
+    type: int = Field(index=False, default=0,
+                      description='Knowledge Base Type, value from KnowledgeTypeEnum')
     description: Optional[str] = Field(default=None, index=True)
     model: Optional[str] = Field(default=None, index=False)
     collection_name: Optional[str] = Field(default=None, index=False)
     index_name: Optional[str] = Field(default=None, index=False)
     state: Optional[int] = Field(index=False, default=KnowledgeState.PUBLISHED.value,
-                                 description='0 is unpublished,1 Is Published, 2 Is copying')
+                                 description='value from KnowledgeState')
 
     metadata_fields: Optional[List[Dict]] = Field(default=None, sa_column=Column(JSON, nullable=True),
                                                   description="Metadata Field Configuration for Knowledge Base")
@@ -198,12 +200,6 @@ def _user_knowledge_filters(
             statement = statement.where(Knowledge.id.in_(filter_knowledge))
         if knowledge_type:
             statement = statement.where(Knowledge.type == knowledge_type.value)
-        elif knowledge_type is False:
-            # When explicitly passed inFalse, do not filter personal knowledge base
-            pass
-        else:
-            # Filter personal knowledge base by default
-            statement = statement.where(Knowledge.type != KnowledgeTypeEnum.PRIVATE.value)
         if name:
 
             conditions = [col(Knowledge.name).like(f'%{name}%'), col(Knowledge.description).like(f'%{name}%')]

update.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-old_version="2.3.0"
-new_version="2.4.0-beta1"
+old_version="2.4.0-beta1"
+new_version="2.4.0-beta1-fix"
 sed -i.bak "s/$old_version/$new_version/g" ./docker/docker-compose.yml
 sed -i.bak "s/$old_version/$new_version/g" ./src/backend/pyproject.toml
 sed -i.bak "s/$old_version/$new_version/g" ./src/backend/bisheng/__init__.py