diff --git a/agent/alembic.ini b/agent/alembic.ini new file mode 100644 index 0000000..807ded2 --- /dev/null +++ b/agent/alembic.ini @@ -0,0 +1,149 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts. +# this is typically a path given in POSIX (e.g. forward slashes) +# format, relative to the token %(here)s which refers to the location of this +# ini file +script_location = %(here)s/alembic + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s +# Or organize into date-based subdirectories (requires recursive_version_locations = true) +# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. for multiple paths, the path separator +# is defined by "path_separator" below. +prepend_sys_path = . + + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the tzdata library which can be installed by adding +# `alembic[tz]` to the pip requirements. +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to /versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "path_separator" +# below. +# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions + +# path_separator; This indicates what character is used to split lists of file +# paths, including version_locations and prepend_sys_path within configparser +# files such as alembic.ini. +# The default rendered in new alembic.ini files is "os", which uses os.pathsep +# to provide os-dependent path splitting. +# +# Note that in order to support legacy alembic.ini files, this default does NOT +# take place if path_separator is not present in alembic.ini. If this +# option is omitted entirely, fallback logic is as follows: +# +# 1. Parsing of the version_locations option falls back to using the legacy +# "version_path_separator" key, which if absent then falls back to the legacy +# behavior of splitting on spaces and/or commas. +# 2. Parsing of the prepend_sys_path option falls back to the legacy +# behavior of splitting on spaces, commas, or colons. +# +# Valid values for path_separator are: +# +# path_separator = : +# path_separator = ; +# path_separator = space +# path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +path_separator = os + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +# database URL. This is consumed by the user-maintained env.py script only. +# other means of configuring database URLs may be customized within the env.py +# file. +sqlalchemy.url = driver://user:pass@localhost/dbname + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module +# hooks = ruff +# ruff.type = module +# ruff.module = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Alternatively, use the exec runner to execute a binary found on your PATH +# hooks = ruff +# ruff.type = exec +# ruff.executable = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration. This is also consumed by the user-maintained +# env.py script only. +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/agent/alembic/README b/agent/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/agent/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/agent/alembic/env.py b/agent/alembic/env.py new file mode 100644 index 0000000..36112a3 --- /dev/null +++ b/agent/alembic/env.py @@ -0,0 +1,78 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = None + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/agent/alembic/script.py.mako b/agent/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/agent/alembic/script.py.mako @@ -0,0 +1,28 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/agent/alembic/versions/a7968da75b72_.py b/agent/alembic/versions/a7968da75b72_.py new file mode 100644 index 0000000..d079021 --- /dev/null +++ b/agent/alembic/versions/a7968da75b72_.py @@ -0,0 +1,98 @@ +"""empty message + +Revision ID: a7968da75b72 +Revises: +Create Date: 2026-07-26 23:23:19.558164 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +import sqlmodel + +# revision identifiers, used by Alembic. +revision: str = 'a7968da75b72' +down_revision: Union[str, Sequence[str], None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('captcharecord', + sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('captcha', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('is_valid', sa.Boolean(), nullable=False), + sa.Column('is_verified', sa.Boolean(), nullable=False), + sa.Column('expired_at', sa.DateTime(), nullable=False), + sa.PrimaryKeyConstraint('email', 'captcha', 'expired_at') + ) + with op.batch_alter_table('captcharecord', schema=None) as batch_op: + batch_op.create_index(batch_op.f('ix_captcharecord_is_valid'), ['is_valid'], unique=False) + batch_op.create_index(batch_op.f('ix_captcharecord_is_verified'), ['is_verified'], unique=False) + + op.create_table('conversationrecord', + sa.Column('id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('user_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('description', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('is_deleted', sa.Boolean(), nullable=False), + sa.Column('created_at', sa.DateTime(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + with op.batch_alter_table('conversationrecord', schema=None) as batch_op: + batch_op.create_index(batch_op.f('ix_conversationrecord_is_deleted'), ['is_deleted'], unique=False) + batch_op.create_index(batch_op.f('ix_conversationrecord_user_id'), ['user_id'], unique=False) + + op.create_table('dialogrecord', + sa.Column('id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('conversation_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('user_prompt', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('thoughts', sa.JSON(), nullable=False), + sa.Column('result_output', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + with op.batch_alter_table('dialogrecord', schema=None) as batch_op: + batch_op.create_index(batch_op.f('ix_dialogrecord_conversation_id'), ['conversation_id'], unique=False) + + op.create_table('resultrecord', + sa.Column('conversation_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('dialog_id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('new_messages', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.PrimaryKeyConstraint('conversation_id', 'dialog_id') + ) + op.create_table('userrecord', + sa.Column('id', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.Column('email', sqlmodel.sql.sqltypes.AutoString(), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + with op.batch_alter_table('userrecord', schema=None) as batch_op: + batch_op.create_index(batch_op.f('ix_userrecord_email'), ['email'], unique=False) + + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + with op.batch_alter_table('userrecord', schema=None) as batch_op: + batch_op.drop_index(batch_op.f('ix_userrecord_email')) + + op.drop_table('userrecord') + op.drop_table('resultrecord') + with op.batch_alter_table('dialogrecord', schema=None) as batch_op: + batch_op.drop_index(batch_op.f('ix_dialogrecord_conversation_id')) + + op.drop_table('dialogrecord') + with op.batch_alter_table('conversationrecord', schema=None) as batch_op: + batch_op.drop_index(batch_op.f('ix_conversationrecord_user_id')) + batch_op.drop_index(batch_op.f('ix_conversationrecord_is_deleted')) + + op.drop_table('conversationrecord') + with op.batch_alter_table('captcharecord', schema=None) as batch_op: + batch_op.drop_index(batch_op.f('ix_captcharecord_is_verified')) + batch_op.drop_index(batch_op.f('ix_captcharecord_is_valid')) + + op.drop_table('captcharecord') + # ### end Alembic commands ### diff --git a/agent/application/application.py b/agent/application/application.py index eba6182..af2e2fa 100644 --- a/agent/application/application.py +++ b/agent/application/application.py @@ -6,7 +6,7 @@ import reflex as rx from application.pages.index import index app = rx.App( - theme=rx.theme(), + theme=rx.theme(color_mode="light"), stylesheets=["/styles.css"], style={ "box-shadow": "none", diff --git a/agent/application/domain_models.py b/agent/application/domain_models.py index 2864271..2ceae48 100644 --- a/agent/application/domain_models.py +++ b/agent/application/domain_models.py @@ -25,7 +25,7 @@ class Dialog(BaseModel): id: str = Field(default_factory=lambda: str(uuid7()), description="对话唯一标识") user_prompt: str = Field(..., description="用户提示词") - thoughts: List[Thought] = Field(default_factory=List, description="思考列表") + thoughts: List[Thought] = Field(default_factory=list, description="思考列表") result_output: str = Field(default="", description="结果输出") is_thinking: bool = Field( default=False, description="正在思考,True 表示正在思考,False 表示未正在思考" @@ -45,7 +45,7 @@ class Conversation(BaseModel): is_running: bool = Field( default=False, description="正在运行,True 表示正在运行,False 表示未正在运行" ) - dialogs: Dict[str, Dialog] = Field(default_factory=Dict, description="对话列表") + dialogs: Dict[str, Dialog] = Field(default_factory=dict, description="对话列表") created_at: datetime = Field(default_factory=datetime.now, description="创建时间") diff --git a/agent/application/pages/index.py b/agent/application/pages/index.py index c9dde18..24c590a 100644 --- a/agent/application/pages/index.py +++ b/agent/application/pages/index.py @@ -210,76 +210,78 @@ def sidebar() -> rx.Component: ) -def login_window() -> rx.Component: +def login_popup() -> rx.Component: """ - 登录窗 + 登录弹窗 :return: Component """ return rx.center( rx.hstack( rx.vstack( + # 标题 rx.text( "登录解锁更多功能", + margin_bottom="24px", line_height="32px", font_size="var(--prismui-font-size-3)", font_weight="var(--prismui-font-weight-3)", - margin_bottom="24px", ), + # 邮箱输入框 rx.input( - placeholder="请输入邮箱地址", + placeholder="请输入邮箱", + # 值绑定邮箱 value=AuthState.email, - width="100%", - height="45px", - margin_bottom="24px", - padding="4px", - border_radius="var(--prismui-border-radius-4)", - line_height="16px", # 值变化事件:设置邮箱 on_change=AuthState.set_email, # 获取焦点事件:重置登录错误信息 - on_focus=AuthState.reset_error_message, + on_focus=AuthState.reset_login_error_message, + width="100%", + height="45px", + padding="4px", + margin_bottom="24px", + border_radius="var(--prismui-border-radius-4)", + line_height="16px", ), - # 自定义验证码输入框 + # 验证码输入框 rx.hstack( rx.input( placeholder="请输入验证码", - max_length=6, + # 值绑定验证码 value=AuthState.captcha, + max_length=6, # 值变化事件:设置验证码 on_change=AuthState.set_captcha, # 获取焦点事件:重置登录错误信息 - on_focus=AuthState.reset_error_message, + on_focus=AuthState.reset_login_error_message, flex=1, height="100%", padding="4px", + border_radius="var(--prismui-border-radius-4)", line_height="16px", - border="none", - style={ - "&": { - "border": "none !important", - }, # 清除父元素边框 - }, + border="none !important", ), rx.button( - # 若验证码发送倒计时大于0则显示倒计时,否则显示获取验证码 + # 若再次发送验证码倒计时大于0则显示倒计时,否则显示获取验证码 rx.cond( AuthState.resend_captcha_countdown > 0, f"{AuthState.resend_captcha_countdown} s", "获取验证码", ), + # 点击事件:发送验证码 + on_click=AuthState.send_captcha, + # 是否禁用绑定验证码发送禁用状态 + disabled=AuthState.is_captcha_sending_disabled, margin="0 8px", background_color="var(--prismui-background-color-1)", line_height="16px", + # 若验证码发送禁用状态为是则颜色设置为 color-4,否则设置为 color-5(主题色) color=rx.cond( AuthState.is_captcha_sending_disabled, "var(--prismui-color-4)", "var(--prismui-color-5)", ), cursor="pointer", - # 点击事件:发送验证码 - on_click=AuthState.send_captcha, - disabled=AuthState.is_captcha_sending_disabled, ), width="100%", height="45px", @@ -379,7 +381,6 @@ def login_window() -> rx.Component: height="100%", padding="40px 48px 0 48px", align_items="center", - background_color="var(--prismui-background-color-1)", ), rx.vstack( rx.image( @@ -447,6 +448,6 @@ def index() -> rx.Component: rx.cond( AuthState.user_id, rx.fragment(), - login_window(), + login_popup(), ), ) diff --git a/agent/application/states/auth.py b/agent/application/states/auth.py index 6373624..27b4b46 100644 --- a/agent/application/states/auth.py +++ b/agent/application/states/auth.py @@ -51,7 +51,7 @@ class AuthState(rx.State): activated_nav_button: str = "conversation" @rx.event - def reset_error_message(self) -> None: + def reset_login_error_message(self) -> None: """ 重置登录错误信息 :return: None diff --git a/agent/database.db b/agent/database.db index 022cca3..b062bcd 100644 Binary files a/agent/database.db and b/agent/database.db differ