diff --git a/backend/alembic/versions/35d925df4568_008_modify_field_type.py b/backend/alembic/versions/35d925df4568_008_modify_field_type.py new file mode 100644 index 00000000..5a9b67c8 --- /dev/null +++ b/backend/alembic/versions/35d925df4568_008_modify_field_type.py @@ -0,0 +1,35 @@ +"""008_modify_field_type + +Revision ID: 35d925df4568 +Revises: ff653d5df198 +Create Date: 2025-05-28 12:15:28.296915 + +""" +from alembic import op +import sqlalchemy as sa +import sqlmodel.sql.sqltypes +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '35d925df4568' +down_revision = 'ff653d5df198' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('core_datasource', 'create_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('core_datasource', 'create_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + # ### end Alembic commands ### diff --git a/backend/apps/chat/schemas/chat_base_schema.py b/backend/apps/chat/schemas/chat_base_schema.py index 5f0fcd72..691bd010 100644 --- a/backend/apps/chat/schemas/chat_base_schema.py +++ b/backend/apps/chat/schemas/chat_base_schema.py @@ -3,7 +3,7 @@ from typing import Optional, Dict, Any, Type from abc import ABC, abstractmethod from langchain_core.language_models import BaseLLM as LangchainBaseLLM from langchain_openai import ChatOpenAI -from langchain_community.llms import Tongyi, VLLM +# from langchain_community.llms import Tongyi, VLLM class LLMConfig(BaseModel): """Base configuration class for large language models""" @@ -43,7 +43,7 @@ class OpenAILLM(BaseLLM): def generate(self, prompt: str) -> str: return self.llm.invoke(prompt) -class TongyiLLM(BaseLLM): +""" class TongyiLLM(BaseLLM): def _init_llm(self) -> LangchainBaseLLM: return Tongyi( model_name=self.config.model_name, @@ -62,7 +62,7 @@ class VLLMLLM(BaseLLM): ) def generate(self, prompt: str) -> str: - return self.llm.invoke(prompt) + return self.llm.invoke(prompt) """ class LLMFactory: @@ -70,8 +70,8 @@ class LLMFactory: _llm_types: Dict[str, Type[BaseLLM]] = { "openai": OpenAILLM, - "tongyi": TongyiLLM, - "vllm": VLLMLLM + "tongyi": OpenAILLM, + "vllm": OpenAILLM } @classmethod diff --git a/backend/apps/datasource/models/datasource.py b/backend/apps/datasource/models/datasource.py index f41ca5ce..55742f7b 100644 --- a/backend/apps/datasource/models/datasource.py +++ b/backend/apps/datasource/models/datasource.py @@ -14,7 +14,7 @@ class CoreDatasource(SQLModel, table=True): type: str = Field(max_length=64) type_name: str = Field(max_length=64, nullable=True) configuration: str = Field(sa_column=Column(Text)) - create_time: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=True)) + create_time: datetime = Field(sa_column=Column(DateTime(timezone=False), nullable=True)) create_by: int = Field(sa_column=Column(BigInteger())) status: str = Field(max_length=64, nullable=True) diff --git a/backend/apps/db/engine.py b/backend/apps/db/engine.py index 57a3b4e8..055ea79e 100644 --- a/backend/apps/db/engine.py +++ b/backend/apps/db/engine.py @@ -1,20 +1,23 @@ # Author: Junjun # Date: 2025/5/19 +import urllib.parse from typing import List from sqlalchemy import create_engine, text, MetaData, Table from sqlalchemy.orm import sessionmaker from apps.datasource.models.datasource import DatasourceConf +from common.core.config import settings def get_engine_config(): - return DatasourceConf(username="root", password="123456", host="127.0.0.1", port=5432, database="sqlbot", + return DatasourceConf(username=settings.POSTGRES_USER, password=settings.POSTGRES_PASSWORD, + host="127.0.0.1", port=settings.POSTGRES_PORT, database=settings.POSTGRES_DB, dbSchema="public") def get_engine_uri(conf: DatasourceConf): - return f"postgresql+psycopg2://{conf.username}:{conf.password}@{conf.host}:{conf.port}/{conf.database}" + return f"postgresql+psycopg2://{urllib.parse.quote(conf.username)}:{urllib.parse.quote(conf.password)}@{conf.host}:{conf.port}/{urllib.parse.quote(conf.database)}" def get_engine_conn(): diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 6392348b..192d20b3 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -24,7 +24,6 @@ dependencies = [ "langchain-openai>=0.3,<0.4", "langchain-community>=0.3,<0.4", "langgraph>=0.3,<0.4", - "vllm>=0.8.5", "dashscope>=1.14.0,<2.0.0", "pymysql (>=1.1.1,<2.0.0)", "cryptography (>=44.0.3,<45.0.0)", diff --git a/frontend/src/views/ds/form.vue b/frontend/src/views/ds/form.vue index 7d6460d2..24774eb3 100644 --- a/frontend/src/views/ds/form.vue +++ b/frontend/src/views/ds/form.vue @@ -1,16 +1,16 @@