fix: tiny fix and make ci happy

Signed-off-by: yihong0618 <zouzou0208@gmail.com>

api/controllers/console/datasets/hit_testing_base.py

@@ -1,7 +1,7 @@
 import logging
 
 from flask_login import current_user  # type: ignore
-from flask_restful import marshal, reqparse  # type: ignore 
+from flask_restful import marshal, reqparse  # type: ignore
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
 import services.dataset_service

api/controllers/service_api/app/app.py

@@ -1,4 +1,4 @@
-from flask_restful import Resource, marshal_with  # type: ignore 
+from flask_restful import Resource, marshal_with  # type: ignore
 
 from controllers.common import fields
 from controllers.common import helpers as controller_helpers

api/controllers/service_api/app/file.py

@@ -1,5 +1,5 @@
 from flask import request
-from flask_restful import Resource, marshal_with  # type: ignore 
+from flask_restful import Resource, marshal_with  # type: ignore
 
 import services
 from controllers.common.errors import FilenameNotExistsError

api/core/app/apps/agent_chat/app_generator.py

@@ -163,7 +163,7 @@ def generate(
         worker_thread = threading.Thread(
             target=self._generate_worker,
             kwargs={
-                "flask_app": current_app._get_current_object(),
+                "flask_app": current_app._get_current_object(),  # type: ignore
                 "application_generate_entity": application_generate_entity,
                 "queue_manager": queue_manager,
                 "conversation_id": conversation.id,

api/core/app/apps/base_app_runner.py

@@ -64,7 +64,7 @@ def get_pre_calculate_rest_tokens(
             ):
                 max_tokens = (
                     model_config.parameters.get(parameter_rule.name)
-                    or model_config.parameters.get(parameter_rule.use_template)
+                    or model_config.parameters.get(parameter_rule.use_template or "")
                 ) or 0
 
         if model_context_tokens is None:
@@ -111,7 +111,7 @@ def recalc_llm_max_tokens(
             ):
                 max_tokens = (
                     model_config.parameters.get(parameter_rule.name)
-                    or model_config.parameters.get(parameter_rule.use_template)
+                    or model_config.parameters.get(parameter_rule.use_template or "")
                 ) or 0
 
         if model_context_tokens is None:
@@ -291,8 +291,8 @@ def _handle_invoke_result_stream(
         :param agent: agent
         :return:
         """
-        model = None
-        prompt_messages = []
+        model: str = ""
+        prompt_messages: list[PromptMessage] = []
         text = ""
         usage = None
         for result in invoke_result:
@@ -350,7 +350,7 @@ def moderation_for_inputs(
             app_id=app_id,
             tenant_id=tenant_id,
             app_config=app_generate_entity.app_config,
-            inputs=inputs,
+            inputs=dict(inputs),
             query=query or "",
             message_id=message_id,
             trace_manager=app_generate_entity.trace_manager,

api/core/app/apps/completion/app_runner.py

@@ -52,8 +52,8 @@ def run(
             app_record=app_record,
             model_config=application_generate_entity.model_conf,
             prompt_template_entity=app_config.prompt_template,
-            inputs=inputs,
-            files=files,
+            inputs=dict(inputs),
+            files=list(files),
             query=query,
         )
 
@@ -63,8 +63,8 @@ def run(
             app_record=app_record,
             model_config=application_generate_entity.model_conf,
             prompt_template_entity=app_config.prompt_template,
-            inputs=inputs,
-            files=files,
+            inputs=dict(inputs),
+            files=list(files),
             query=query,
         )
 
@@ -76,7 +76,7 @@ def run(
                 tenant_id=app_config.tenant_id,
                 app_generate_entity=application_generate_entity,
                 inputs=inputs,
-                query=query,
+                query=query or "",
                 message_id=message.id,
             )
         except ModerationError as e:
@@ -122,7 +122,7 @@ def run(
                 tenant_id=app_record.tenant_id,
                 model_config=application_generate_entity.model_conf,
                 config=dataset_config,
-                query=query,
+                query=query or "",
                 invoke_from=application_generate_entity.invoke_from,
                 show_retrieve_source=app_config.additional_features.show_retrieve_source,
                 hit_callback=hit_callback,
@@ -137,7 +137,7 @@ def run(
             model_config=application_generate_entity.model_conf,
             prompt_template_entity=app_config.prompt_template,
             inputs=inputs,
-            files=files,
+            files=list(files),
             query=query,
             context=context,
         )

api/core/app/task_pipeline/workflow_cycle_manage.py

@@ -428,7 +428,7 @@ def _workflow_finish_to_stream_response(
                 created_by=created_by,
                 created_at=int(workflow_run.created_at.timestamp()),
                 finished_at=int(workflow_run.finished_at.timestamp()),
-                files=self._fetch_files_from_node_outputs(workflow_run.outputs_dict),
+                files=self._fetch_files_from_node_outputs(dict(workflow_run.outputs_dict)),
             ),
         )
 
@@ -718,7 +718,7 @@ def _get_file_var_from_value(self, value: Union[dict, list]) -> Mapping[str, Any
             return value
         elif isinstance(value, File):
             return value.to_dict()
-        
+
         return None
 
     def _refetch_workflow_run(self, workflow_run_id: str) -> WorkflowRun:

api/core/tools/provider/builtin/audio/tools/tts.py

@@ -11,19 +11,21 @@
 
 class TTSTool(BuiltinTool):
     def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> list[ToolInvokeMessage]:
-        provider, model = tool_parameters.get("model").split("#")
-        voice = tool_parameters.get(f"voice#{provider}#{model}")
+        provider, model = tool_parameters.get("model", "").split("#")
+        voice = tool_parameters.get(f"voice#{provider}#{model}", "")
         model_manager = ModelManager()
+        if not self.runtime:
+            raise ValueError("Runtime is required")
         model_instance = model_manager.get_model_instance(
-            tenant_id=self.runtime.tenant_id,
+            tenant_id=self.runtime.tenant_id or "",
             provider=provider,
             model_type=ModelType.TTS,
             model=model,
         )
         tts = model_instance.invoke_tts(
-            content_text=tool_parameters.get("text"),
+            content_text=tool_parameters.get("text", ""),
             user=user_id,
-            tenant_id=self.runtime.tenant_id,
+            tenant_id=self.runtime.tenant_id or "",
             voice=voice,
         )
         buffer = io.BytesIO()
@@ -41,8 +43,11 @@ def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> list[ToolInv
         ]
 
     def get_available_models(self) -> list[tuple[str, str, list[Any]]]:
+        if not self.runtime:
+            raise ValueError("Runtime is required")
         model_provider_service = ModelProviderService()
-        models = model_provider_service.get_models_by_model_type(tenant_id=self.runtime.tenant_id, model_type="tts")
+        tid: str = self.runtime.tenant_id or ""
+        models = model_provider_service.get_models_by_model_type(tenant_id=tid, model_type="tts")
         items = []
         for provider_model in models:
             provider = provider_model.provider
@@ -62,6 +67,8 @@ def get_runtime_parameters(self) -> list[ToolParameter]:
                 ToolParameter(
                     name=f"voice#{provider}#{model}",
                     label=I18nObject(en_US=f"Voice of {model}({provider})"),
+                    human_description=I18nObject(en_US=f"Select a voice for {model} model"),
+                    placeholder=I18nObject(en_US="Select a voice"),
                     type=ToolParameter.ToolParameterType.SELECT,
                     form=ToolParameter.ToolParameterForm.FORM,
                     options=[
@@ -83,6 +90,7 @@ def get_runtime_parameters(self) -> list[ToolParameter]:
                 type=ToolParameter.ToolParameterType.SELECT,
                 form=ToolParameter.ToolParameterForm.FORM,
                 required=True,
+                placeholder=I18nObject(en_US="Select a model", zh_Hans="选择模型"),
                 options=options,
             ),
         )

api/core/workflow/graph_engine/graph_engine.py

@@ -5,7 +5,7 @@
 from collections.abc import Generator, Mapping
 from concurrent.futures import ThreadPoolExecutor, wait
 from copy import copy, deepcopy
-from typing import Any, Optional
+from typing import Any, Optional, Union
 
 from flask import Flask, current_app
 
@@ -129,6 +129,7 @@ def __init__(
     def run(self) -> Generator[GraphEngineEvent, None, None]:
         # trigger graph run start event
         yield GraphRunStartedEvent()
+        stream_processor: Optional[Union[EndStreamProcessor, AnswerStreamProcessor]] = None
 
         try:
             if self.init_params.workflow_type == WorkflowType.CHAT:
@@ -321,7 +322,7 @@ def _run(
 
                 if any(edge.run_condition for edge in edge_mappings):
                     # if nodes has run conditions, get node id which branch to take based on the run condition results
-                    condition_edge_mappings = {}
+                    condition_edge_mappings: dict[str, list[GraphEdge]] = {}
                     for edge in edge_mappings:
                         if edge.run_condition:
                             run_condition_hash = edge.run_condition.hash
@@ -335,7 +336,8 @@ def _run(
                             continue
 
                         edge = sub_edge_mappings[0]
-
+                        if not edge.run_condition:
+                            continue
                         result = ConditionManager.get_condition_handler(
                             init_params=self.init_params,
                             graph=self.graph,

api/fields/workflow_run_fields.py

@@ -1,4 +1,4 @@
-from flask_restful import fields  # type: ignore 
+from flask_restful import fields  # type: ignore
 
 from fields.end_user_fields import simple_end_user_fields
 from fields.member_fields import simple_account_fields

api/models/account.py

@@ -16,7 +16,7 @@ class AccountStatus(str, enum.Enum):
     CLOSED = "closed"
 
 
-class Account(UserMixin, db.Model):   # type: ignore[name-defined]
+class Account(UserMixin, db.Model):  # type: ignore[name-defined]
     __tablename__ = "accounts"
     __table_args__ = (db.PrimaryKeyConstraint("id", name="account_pkey"), db.Index("account_email_idx", "email"))
 
@@ -206,7 +206,7 @@ class TenantAccountJoinRole(enum.Enum):
     DATASET_OPERATOR = "dataset_operator"
 
 
-class TenantAccountJoin(db.Model):   # type: ignore[name-defined]
+class TenantAccountJoin(db.Model):  # type: ignore[name-defined]
     __tablename__ = "tenant_account_joins"
     __table_args__ = (
         db.PrimaryKeyConstraint("id", name="tenant_account_join_pkey"),
@@ -225,7 +225,7 @@ class TenantAccountJoin(db.Model):   # type: ignore[name-defined]
     updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
 
 
-class AccountIntegrate(db.Model):   # type: ignore[name-defined]
+class AccountIntegrate(db.Model):  # type: ignore[name-defined]
     __tablename__ = "account_integrates"
     __table_args__ = (
         db.PrimaryKeyConstraint("id", name="account_integrate_pkey"),
@@ -242,7 +242,7 @@ class AccountIntegrate(db.Model):   # type: ignore[name-defined]
     updated_at = db.Column(db.DateTime, nullable=False, server_default=db.text("CURRENT_TIMESTAMP(0)"))
 
 
-class InvitationCode(db.Model):   # type: ignore[name-defined]
+class InvitationCode(db.Model):  # type: ignore[name-defined]
     __tablename__ = "invitation_codes"
     __table_args__ = (
         db.PrimaryKeyConstraint("id", name="invitation_code_pkey"),

api/pyproject.toml

@@ -156,6 +156,7 @@ oci = "~2.135.1"
 openai = "~1.52.0"
 openpyxl = "~3.1.5"
 pandas = { version = "~2.2.2", extras = ["performance", "excel"] }
+pandas-stubs = "~2.2.3.241009"
 psycopg2-binary = "~2.9.6"
 pycryptodome = "3.19.1"
 pydantic = "~2.9.2"
@@ -180,6 +181,7 @@ tencentcloud-sdk-python-hunyuan = "~3.0.1158"
 tiktoken = "~0.8.0"
 tokenizers = "~0.15.0"
 transformers = "~4.35.0"
+types-pytz = "~2024.2.0.20241003"
 unstructured = { version = "~0.16.1", extras = ["docx", "epub", "md", "msg", "ppt", "pptx"] }
 validators = "0.21.0"
 volcengine-python-sdk = {extras = ["ark"], version = "~1.0.98"}
@@ -196,7 +198,6 @@ zhipuai = "~2.1.5"
 # Related transparent dependencies with pinned version
 # required by main implementations
 ############################################################
-pandas-stubs = "^2.2.3.241009"
 [tool.poetry.group.indirect.dependencies]
 kaleido = "0.2.1"
 rank-bm25 = "~0.2.2"