From 3d28d2527b278c500c1486c92fc72a1a78b9f9bc Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Mon, 15 Apr 2024 19:06:42 +0800
Subject: [PATCH] fix: typos

* fix: typos
---
 .gitignore                                     |  2 +-
 .../serializers/application_serializers.py     |  4 ++--
 .../serializers/chat_message_serializers.py    | 10 +++++-----
 apps/common/event/listener_manage.py           |  2 +-
 apps/common/{froms => forms}/__init__.py       |  0
 .../{froms => forms}/array_object_card.py      |  2 +-
 apps/common/{froms => forms}/base_field.py     |  0
 apps/common/{froms => forms}/base_form.py      |  2 +-
 apps/common/{froms => forms}/multi_select.py   |  2 +-
 apps/common/{froms => forms}/object_card.py    |  2 +-
 apps/common/{froms => forms}/password_input.py |  2 +-
 .../{froms => forms}/radio_button_field.py     |  2 +-
 .../{froms => forms}/radio_card_field.py       |  2 +-
 apps/common/{froms => forms}/radio_field.py    |  2 +-
 .../{froms => forms}/single_select_field.py    |  2 +-
 apps/common/{froms => forms}/tab_card.py       |  2 +-
 apps/common/{froms => forms}/table_checkbox.py |  2 +-
 apps/common/{froms => forms}/table_radio.py    |  2 +-
 .../{froms => forms}/text_input_field.py       |  2 +-
 .../azure_model_provider.py                    | 18 +++++++++---------
 .../ollama_model_provider.py                   |  8 ++++----
 .../openai_model_provider.py                   |  8 ++++----
 .../wenxin_model_provider.py                   |  8 ++++----
 apps/smartdoc/urls.py                          |  6 +++---
 installer/run-maxkb.sh                         |  4 ++--
 25 files changed, 48 insertions(+), 48 deletions(-)
 rename apps/common/{froms => forms}/__init__.py (100%)
 rename apps/common/{froms => forms}/array_object_card.py (94%)
 rename apps/common/{froms => forms}/base_field.py (100%)
 rename apps/common/{froms => forms}/base_form.py (92%)
 rename apps/common/{froms => forms}/multi_select.py (95%)
 rename apps/common/{froms => forms}/object_card.py (94%)
 rename apps/common/{froms => forms}/password_input.py (93%)
 rename apps/common/{froms => forms}/radio_button_field.py (94%)
 rename apps/common/{froms => forms}/radio_card_field.py (94%)
 rename apps/common/{froms => forms}/radio_field.py (94%)
 rename apps/common/{froms => forms}/single_select_field.py (95%)
 rename apps/common/{froms => forms}/tab_card.py (94%)
 rename apps/common/{froms => forms}/table_checkbox.py (94%)
 rename apps/common/{froms => forms}/table_radio.py (94%)
 rename apps/common/{froms => forms}/text_input_field.py (91%)

diff --git a/.gitignore b/.gitignore
index 7e6be9bfb79..c6d277f80f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ share/python-wheels/
 MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script froms a template
+#  Usually these files are written by a python script forms a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
diff --git a/apps/application/serializers/application_serializers.py b/apps/application/serializers/application_serializers.py
index 44ecce1f9c7..6ae7cc463cf 100644
--- a/apps/application/serializers/application_serializers.py
+++ b/apps/application/serializers/application_serializers.py
@@ -257,7 +257,7 @@ def insert(self, application: Dict):
             application_model = ApplicationSerializer.Create.to_application_model(user_id, application)
             dataset_id_list = application.get('dataset_id_list', [])
             application_dataset_mapping_model_list = [
-                ApplicationSerializer.Create.to_application_dateset_mapping(application_model.id, dataset_id) for
+                ApplicationSerializer.Create.to_application_dataset_mapping(application_model.id, dataset_id) for
                 dataset_id in dataset_id_list]
             # 插入应用
             application_model.save()
@@ -280,7 +280,7 @@ def to_application_model(user_id: str, application: Dict):
                                )
 
         @staticmethod
-        def to_application_dateset_mapping(application_id: str, dataset_id: str):
+        def to_application_dataset_mapping(application_id: str, dataset_id: str):
             return ApplicationDatasetMapping(id=uuid.uuid1(), application_id=application_id, dataset_id=dataset_id)
 
     class HitTest(serializers.Serializer):
diff --git a/apps/application/serializers/chat_message_serializers.py b/apps/application/serializers/chat_message_serializers.py
index 3f0cf01cf1e..dbbffb2a2e8 100644
--- a/apps/application/serializers/chat_message_serializers.py
+++ b/apps/application/serializers/chat_message_serializers.py
@@ -178,12 +178,12 @@ def chat(self):
         client_id = self.data.get('client_id')
         client_type = self.data.get('client_type')
         chat_info = self.is_valid(raise_exception=True)
-        pipline_manage_builder = PipelineManage.builder()
+        pipeline_manage_builder = PipelineManage.builder()
         # 如果开启了问题优化,则添加上问题优化步骤
         if chat_info.application.problem_optimization:
-            pipline_manage_builder.append_step(BaseResetProblemStep)
+            pipeline_manage_builder.append_step(BaseResetProblemStep)
         # 构建流水线管理器
-        pipline_message = (pipline_manage_builder.append_step(BaseSearchDatasetStep)
+        pipeline_message = (pipeline_manage_builder.append_step(BaseSearchDatasetStep)
                            .append_step(BaseGenerateHumanMessageStep)
                            .append_step(BaseChatStep)
                            .build())
@@ -198,8 +198,8 @@ def chat(self):
         params = chat_info.to_pipeline_manage_params(message, get_post_handler(chat_info), exclude_paragraph_id_list,
                                                      client_id, client_type, stream)
         # 运行流水线作业
-        pipline_message.run(params)
-        return pipline_message.context['chat_result']
+        pipeline_message.run(params)
+        return pipeline_message.context['chat_result']
 
     @staticmethod
     def re_open_chat(chat_id: str):
diff --git a/apps/common/event/listener_manage.py b/apps/common/event/listener_manage.py
index 93613a02a6b..98e22c821be 100644
--- a/apps/common/event/listener_manage.py
+++ b/apps/common/event/listener_manage.py
@@ -215,7 +215,7 @@ def delete_embedding_by_dataset_id_list(source_ids: List[str]):
 
     @staticmethod
     @poxy
-    def init_embedding_model(ags):
+    def init_embedding_model(ages):
         EmbeddingModel.get_embedding_model()
 
     def run(self):
diff --git a/apps/common/froms/__init__.py b/apps/common/forms/__init__.py
similarity index 100%
rename from apps/common/froms/__init__.py
rename to apps/common/forms/__init__.py
diff --git a/apps/common/froms/array_object_card.py b/apps/common/forms/array_object_card.py
similarity index 94%
rename from apps/common/froms/array_object_card.py
rename to apps/common/forms/array_object_card.py
index 9cf8c9bf859..2dc71aaaf88 100644
--- a/apps/common/froms/array_object_card.py
+++ b/apps/common/forms/array_object_card.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class ArrayCard(BaseExecField):
diff --git a/apps/common/froms/base_field.py b/apps/common/forms/base_field.py
similarity index 100%
rename from apps/common/froms/base_field.py
rename to apps/common/forms/base_field.py
diff --git a/apps/common/froms/base_form.py b/apps/common/forms/base_form.py
similarity index 92%
rename from apps/common/froms/base_form.py
rename to apps/common/forms/base_form.py
index 49e4556fa2a..93984b8c61b 100644
--- a/apps/common/froms/base_form.py
+++ b/apps/common/forms/base_form.py
@@ -6,7 +6,7 @@
     @date：2023/11/1 16:04
     @desc:
 """
-from common.froms import BaseField
+from common.forms import BaseField
 
 
 class BaseForm:
diff --git a/apps/common/froms/multi_select.py b/apps/common/forms/multi_select.py
similarity index 95%
rename from apps/common/froms/multi_select.py
rename to apps/common/forms/multi_select.py
index f3c85422485..791c8e974dd 100644
--- a/apps/common/froms/multi_select.py
+++ b/apps/common/forms/multi_select.py
@@ -8,7 +8,7 @@
 """
 from typing import List, Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class MultiSelect(BaseExecField):
diff --git a/apps/common/froms/object_card.py b/apps/common/forms/object_card.py
similarity index 94%
rename from apps/common/froms/object_card.py
rename to apps/common/forms/object_card.py
index 0245ba296c8..ddb192ef9a6 100644
--- a/apps/common/froms/object_card.py
+++ b/apps/common/forms/object_card.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class ObjectCard(BaseExecField):
diff --git a/apps/common/froms/password_input.py b/apps/common/forms/password_input.py
similarity index 93%
rename from apps/common/froms/password_input.py
rename to apps/common/forms/password_input.py
index 87a97e24d17..e7c7923bb87 100644
--- a/apps/common/froms/password_input.py
+++ b/apps/common/forms/password_input.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms import BaseField, TriggerType
+from common.forms import BaseField, TriggerType
 
 
 class PasswordInputField(BaseField):
diff --git a/apps/common/froms/radio_button_field.py b/apps/common/forms/radio_button_field.py
similarity index 94%
rename from apps/common/froms/radio_button_field.py
rename to apps/common/forms/radio_button_field.py
index 5c7f2cf9ad2..aa695230392 100644
--- a/apps/common/froms/radio_button_field.py
+++ b/apps/common/forms/radio_button_field.py
@@ -8,7 +8,7 @@
 """
 from typing import List, Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class Radio(BaseExecField):
diff --git a/apps/common/froms/radio_card_field.py b/apps/common/forms/radio_card_field.py
similarity index 94%
rename from apps/common/froms/radio_card_field.py
rename to apps/common/forms/radio_card_field.py
index 07c57dcd9a1..b3579b84d96 100644
--- a/apps/common/froms/radio_card_field.py
+++ b/apps/common/forms/radio_card_field.py
@@ -8,7 +8,7 @@
 """
 from typing import List, Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class Radio(BaseExecField):
diff --git a/apps/common/froms/radio_field.py b/apps/common/forms/radio_field.py
similarity index 94%
rename from apps/common/froms/radio_field.py
rename to apps/common/forms/radio_field.py
index b8fcbd9b1bb..94a016d9d63 100644
--- a/apps/common/froms/radio_field.py
+++ b/apps/common/forms/radio_field.py
@@ -8,7 +8,7 @@
 """
 from typing import List, Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class Radio(BaseExecField):
diff --git a/apps/common/froms/single_select_field.py b/apps/common/forms/single_select_field.py
similarity index 95%
rename from apps/common/froms/single_select_field.py
rename to apps/common/forms/single_select_field.py
index f0d359d9021..cf3d5040965 100644
--- a/apps/common/froms/single_select_field.py
+++ b/apps/common/forms/single_select_field.py
@@ -8,7 +8,7 @@
 """
 from typing import List, Dict
 
-from common.froms.base_field import TriggerType, BaseExecField
+from common.forms.base_field import TriggerType, BaseExecField
 
 
 class SingleSelect(BaseExecField):
diff --git a/apps/common/froms/tab_card.py b/apps/common/forms/tab_card.py
similarity index 94%
rename from apps/common/froms/tab_card.py
rename to apps/common/forms/tab_card.py
index f7399943135..7907714bdcd 100644
--- a/apps/common/froms/tab_card.py
+++ b/apps/common/forms/tab_card.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import BaseExecField, TriggerType
+from common.forms.base_field import BaseExecField, TriggerType
 
 
 class TabCard(BaseExecField):
diff --git a/apps/common/froms/table_checkbox.py b/apps/common/forms/table_checkbox.py
similarity index 94%
rename from apps/common/froms/table_checkbox.py
rename to apps/common/forms/table_checkbox.py
index 16d61ddb2e2..e01f14d314f 100644
--- a/apps/common/froms/table_checkbox.py
+++ b/apps/common/forms/table_checkbox.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import TriggerType, BaseExecField
+from common.forms.base_field import TriggerType, BaseExecField
 
 
 class TableRadio(BaseExecField):
diff --git a/apps/common/froms/table_radio.py b/apps/common/forms/table_radio.py
similarity index 94%
rename from apps/common/froms/table_radio.py
rename to apps/common/forms/table_radio.py
index 0c2ef2fc63d..3b4c2bfb031 100644
--- a/apps/common/froms/table_radio.py
+++ b/apps/common/forms/table_radio.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import TriggerType, BaseExecField
+from common.forms.base_field import TriggerType, BaseExecField
 
 
 class TableRadio(BaseExecField):
diff --git a/apps/common/froms/text_input_field.py b/apps/common/forms/text_input_field.py
similarity index 91%
rename from apps/common/froms/text_input_field.py
rename to apps/common/forms/text_input_field.py
index eeb16782bf6..28a821e1570 100644
--- a/apps/common/froms/text_input_field.py
+++ b/apps/common/forms/text_input_field.py
@@ -8,7 +8,7 @@
 """
 from typing import Dict
 
-from common.froms.base_field import BaseField, TriggerType
+from common.forms.base_field import BaseField, TriggerType
 
 
 class TextInputField(BaseField):
diff --git a/apps/setting/models_provider/impl/azure_model_provider/azure_model_provider.py b/apps/setting/models_provider/impl/azure_model_provider/azure_model_provider.py
index 35775d8665d..f58f8744cb4 100644
--- a/apps/setting/models_provider/impl/azure_model_provider/azure_model_provider.py
+++ b/apps/setting/models_provider/impl/azure_model_provider/azure_model_provider.py
@@ -12,9 +12,9 @@
 from langchain.schema import HumanMessage
 from langchain_community.chat_models.azure_openai import AzureChatOpenAI
 
-from common import froms
+from common import forms
 from common.exception.app_exception import AppApiException
-from common.froms import BaseForm
+from common.forms import BaseForm
 from common.util.file_util import get_file_content
 from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, BaseModelCredential, \
     ModelInfo, \
@@ -51,11 +51,11 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
     def encryption_dict(self, model: Dict[str, object]):
         return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
 
-    api_base = froms.TextInputField('API 域名', required=True)
+    api_base = forms.TextInputField('API 域名', required=True)
 
-    api_key = froms.PasswordInputField("API Key", required=True)
+    api_key = forms.PasswordInputField("API Key", required=True)
 
-    deployment_name = froms.TextInputField("部署名", required=True)
+    deployment_name = forms.TextInputField("部署名", required=True)
 
 
 class DefaultAzureLLMModelCredential(BaseForm, BaseModelCredential):
@@ -87,13 +87,13 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
     def encryption_dict(self, model: Dict[str, object]):
         return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
 
-    api_version = froms.TextInputField("api_version", required=True)
+    api_version = forms.TextInputField("api_version", required=True)
 
-    api_base = froms.TextInputField('API 域名', required=True)
+    api_base = forms.TextInputField('API 域名', required=True)
 
-    api_key = froms.PasswordInputField("API Key", required=True)
+    api_key = forms.PasswordInputField("API Key", required=True)
 
-    deployment_name = froms.TextInputField("部署名", required=True)
+    deployment_name = forms.TextInputField("部署名", required=True)
 
 
 azure_llm_model_credential = AzureLLMModelCredential()
diff --git a/apps/setting/models_provider/impl/ollama_model_provider/ollama_model_provider.py b/apps/setting/models_provider/impl/ollama_model_provider/ollama_model_provider.py
index 2d8097a700d..2cc1601a317 100644
--- a/apps/setting/models_provider/impl/ollama_model_provider/ollama_model_provider.py
+++ b/apps/setting/models_provider/impl/ollama_model_provider/ollama_model_provider.py
@@ -14,9 +14,9 @@
 import requests
 from langchain.chat_models.base import BaseChatModel
 
-from common import froms
+from common import forms
 from common.exception.app_exception import AppApiException
-from common.froms import BaseForm
+from common.forms import BaseForm
 from common.util.file_util import get_file_content
 from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, ModelInfo, ModelTypeConst, \
     BaseModelCredential, DownModelChunk, DownModelChunkStatus, ValidCode
@@ -51,8 +51,8 @@ def build_model(self, model_info: Dict[str, object]):
         self.api_key = model_info.get('api_key')
         return self
 
-    api_base = froms.TextInputField('API 域名', required=True)
-    api_key = froms.PasswordInputField('API Key', required=True)
+    api_base = forms.TextInputField('API 域名', required=True)
+    api_key = forms.PasswordInputField('API Key', required=True)
 
 
 ollama_llm_model_credential = OllamaLLMModelCredential()
diff --git a/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py b/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py
index 55754619d79..6529d178421 100644
--- a/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py
+++ b/apps/setting/models_provider/impl/openai_model_provider/openai_model_provider.py
@@ -12,9 +12,9 @@
 from langchain.schema import HumanMessage
 from langchain_openai import ChatOpenAI
 
-from common import froms
+from common import forms
 from common.exception.app_exception import AppApiException
-from common.froms import BaseForm
+from common.forms import BaseForm
 from common.util.file_util import get_file_content
 from setting.models_provider.base_model_provider import IModelProvider, ModelProvideInfo, BaseModelCredential, \
     ModelInfo, \
@@ -50,8 +50,8 @@ def is_valid(self, model_type: str, model_name, model_credential: Dict[str, obje
     def encryption_dict(self, model: Dict[str, object]):
         return {**model, 'api_key': super().encryption(model.get('api_key', ''))}
 
-    api_base = froms.TextInputField('API 域名', required=True)
-    api_key = froms.PasswordInputField('API Key', required=True)
+    api_base = forms.TextInputField('API 域名', required=True)
+    api_key = forms.PasswordInputField('API Key', required=True)
 
 
 openai_llm_model_credential = OpenAILLMModelCredential()
diff --git a/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py b/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py
index 2805f4b1d47..3d7c9a7d9ed 100644
--- a/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py
+++ b/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py
@@ -13,9 +13,9 @@
 from langchain_community.chat_models import QianfanChatEndpoint
 from qianfan import ChatCompletion
 
-from common import froms
+from common import forms
 from common.exception.app_exception import AppApiException
-from common.froms import BaseForm
+from common.forms import BaseForm
 from common.util.file_util import get_file_content
 from setting.models_provider.base_model_provider import ModelProvideInfo, ModelTypeConst, BaseModelCredential, \
     ModelInfo, IModelProvider, ValidCode
@@ -55,9 +55,9 @@ def build_model(self, model_info: Dict[str, object]):
         self.secret_key = model_info.get('secret_key')
         return self
 
-    api_key = froms.PasswordInputField('API Key', required=True)
+    api_key = forms.PasswordInputField('API Key', required=True)
 
-    secret_key = froms.PasswordInputField("Secret Key", required=True)
+    secret_key = forms.PasswordInputField("Secret Key", required=True)
 
 
 win_xin_llm_model_credential = WenxinLLMModelCredential()
diff --git a/apps/smartdoc/urls.py b/apps/smartdoc/urls.py
index a7f99c1ee0a..9e85a1874a5 100644
--- a/apps/smartdoc/urls.py
+++ b/apps/smartdoc/urls.py
@@ -5,13 +5,13 @@
     https://docs.djangoproject.com/en/4.2/topics/http/urls/
 Examples:
 Function views
-    1. Add an import:  froms my_app import views
+    1. Add an import:  forms my_app import views
     2. Add a URL to urlpatterns:  path('', views.home, name='home')
 Class-based views
-    1. Add an import:  froms other_app.views import Home
+    1. Add an import:  forms other_app.views import Home
     2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
 Including another URLconf
-    1. Import the include() function: froms django.urls import include, path
+    1. Import the include() function: forms django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 import os
diff --git a/installer/run-maxkb.sh b/installer/run-maxkb.sh
index b60cd5bf7d1..597da7f025c 100644
--- a/installer/run-maxkb.sh
+++ b/installer/run-maxkb.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# Start postgress
+# Start postgresql
 docker-entrypoint.sh postgres &
 sleep 10
-# Wait postgress
+# Wait postgresql
 until pg_isready --host=127.0.0.1; do sleep 1 && echo "waiting for postgres"; done
 
 # Start MaxKB