Merge branch 'v2' into pr@v2@fix_shard_model

Author: shaohuzhang1

apps/common/handle/impl/text/zip_split_handle.py

@@ -27,6 +27,7 @@
 from common.handle.impl.text.xls_split_handle import XlsSplitHandle
 from common.handle.impl.text.xlsx_split_handle import XlsxSplitHandle
 from common.utils.common import parse_md_image
+from knowledge.models import File
 
 
 class FileBufferHandle:
@@ -84,19 +85,19 @@ def get_image_list(result_list: list, zip_files: List[str]):
                     if not zip_files.__contains__(image_path):
                         continue
                     if image_path.startswith('oss/file/') or image_path.startswith('oss/image/'):
-                        image_id = image_path.replace('oss/file/', '').replace('oss/image/', '')
+                        image_id = image_path.replace('oss/file/', '').replace('oss/file/', '')
                         if is_valid_uuid(image_id):
                             image_file_list.append({'source_file': image_path,
                                                     'image_id': image_id})
                         else:
                             image_file_list.append({'source_file': image_path,
                                                     'image_id': new_image_id})
-                            content = content.replace(source_image_path, f'/oss/image/{new_image_id}')
+                            content = content.replace(source_image_path, f'/oss/file/{new_image_id}')
                             p['content'] = content
                     else:
                         image_file_list.append({'source_file': image_path,
                                                 'image_id': new_image_id})
-                        content = content.replace(source_image_path, f'/oss/image/{new_image_id}')
+                        content = content.replace(source_image_path, f'/oss/file/{new_image_id}')
                         p['content'] = content
 
     return image_file_list

apps/models_provider/impl/aliyun_bai_lian_model_provider/credential/image.py

@@ -15,6 +15,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 
@@ -48,6 +49,8 @@ def is_valid(
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/anthropic_model_provider/credential/image.py

@@ -8,6 +8,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 
@@ -31,6 +32,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext("Hello")}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/azure_model_provider/credential/image.py

@@ -9,6 +9,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 from django.utils.translation import gettext_lazy as _, gettext
 
@@ -38,6 +39,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/gemini_model_provider/credential/image.py

@@ -8,6 +8,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 
@@ -30,6 +31,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/openai_model_provider/credential/image.py

@@ -9,6 +9,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 from django.utils.translation import gettext_lazy as _, gettext
 
@@ -33,6 +34,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/siliconCloud_model_provider/credential/image.py

@@ -9,6 +9,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 from django.utils.translation import gettext_lazy as _, gettext
 
@@ -33,6 +34,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/tencent_model_provider/credential/image.py

@@ -15,6 +15,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 
@@ -35,6 +36,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/vllm_model_provider/credential/image.py

@@ -8,6 +8,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 class VllmImageModelCredential(BaseForm, BaseModelCredential):
@@ -30,6 +31,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": "你好"}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):

apps/models_provider/impl/volcanic_engine_model_provider/credential/image.py

@@ -8,6 +8,7 @@
 from common import forms
 from common.exception.app_exception import AppApiException
 from common.forms import BaseForm, TooltipLabel
+from common.utils.logger import maxkb_logger
 from models_provider.base_model_provider import BaseModelCredential, ValidCode
 
 class VolcanicEngineImageModelCredential(BaseForm, BaseModelCredential):
@@ -30,6 +31,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
         try:
             model = provider.get_model(model_type, model_name, model_credential, **model_params)
             res = model.stream([HumanMessage(content=[{"type": "text", "text": gettext('Hello')}])])
+            for chunk in res:
+                maxkb_logger.info(chunk)
         except Exception as e:
             traceback.print_exc()
             if isinstance(e, AppApiException):