diff --git a/backend/open_webui/main.py b/backend/open_webui/main.py index 85d05b63fa..94aae18048 100644 --- a/backend/open_webui/main.py +++ b/backend/open_webui/main.py @@ -650,6 +650,7 @@ async def lifespan(app: FastAPI): asyncio.create_task(periodic_session_pool_cleanup()) from open_webui.utils.automations import automation_worker_loop + asyncio.create_task(automation_worker_loop(app)) if app.state.config.ENABLE_BASE_MODELS_CACHE: diff --git a/backend/open_webui/migrations/versions/b7c8d9e0f1a2_add_last_read_at_to_chat.py b/backend/open_webui/migrations/versions/b7c8d9e0f1a2_add_last_read_at_to_chat.py index ba921763b4..fb254432f6 100644 --- a/backend/open_webui/migrations/versions/b7c8d9e0f1a2_add_last_read_at_to_chat.py +++ b/backend/open_webui/migrations/versions/b7c8d9e0f1a2_add_last_read_at_to_chat.py @@ -5,6 +5,7 @@ Revises: d4e5f6a7b8c9 Create Date: 2026-04-01 04:00:00.000000 """ + from alembic import op import sqlalchemy as sa diff --git a/backend/open_webui/migrations/versions/d4e5f6a7b8c9_add_automation_tables.py b/backend/open_webui/migrations/versions/d4e5f6a7b8c9_add_automation_tables.py index 3fca1d6358..45c6f4336d 100644 --- a/backend/open_webui/migrations/versions/d4e5f6a7b8c9_add_automation_tables.py +++ b/backend/open_webui/migrations/versions/d4e5f6a7b8c9_add_automation_tables.py @@ -10,51 +10,51 @@ from typing import Union from alembic import op import sqlalchemy as sa -revision: str = "d4e5f6a7b8c9" -down_revision: Union[str, None] = "a3dd5bedd151" +revision: str = 'd4e5f6a7b8c9' +down_revision: Union[str, None] = 'a3dd5bedd151' branch_labels = None depends_on = None def upgrade(): op.create_table( - "automation", - sa.Column("id", sa.Text(), primary_key=True), - sa.Column("user_id", sa.Text(), nullable=False), - sa.Column("name", sa.Text(), nullable=False), - sa.Column("data", sa.JSON(), nullable=False), - sa.Column("meta", sa.JSON(), nullable=True), + 'automation', + sa.Column('id', sa.Text(), primary_key=True), + sa.Column('user_id', sa.Text(), nullable=False), + sa.Column('name', sa.Text(), nullable=False), + sa.Column('data', sa.JSON(), nullable=False), + sa.Column('meta', sa.JSON(), nullable=True), sa.Column( - "is_active", + 'is_active', sa.Boolean(), nullable=False, - server_default=sa.text("1"), + server_default=sa.text('1'), ), - sa.Column("last_run_at", sa.BigInteger(), nullable=True), - sa.Column("next_run_at", sa.BigInteger(), nullable=True), - sa.Column("created_at", sa.BigInteger(), nullable=False), - sa.Column("updated_at", sa.BigInteger(), nullable=False), + sa.Column('last_run_at', sa.BigInteger(), nullable=True), + sa.Column('next_run_at', sa.BigInteger(), nullable=True), + sa.Column('created_at', sa.BigInteger(), nullable=False), + sa.Column('updated_at', sa.BigInteger(), nullable=False), ) - op.create_index("ix_automation_next_run", "automation", ["next_run_at"]) + op.create_index('ix_automation_next_run', 'automation', ['next_run_at']) op.create_table( - "automation_run", - sa.Column("id", sa.Text(), primary_key=True), - sa.Column("automation_id", sa.Text(), nullable=False), - sa.Column("chat_id", sa.Text(), nullable=True), - sa.Column("status", sa.Text(), nullable=False), - sa.Column("error", sa.Text(), nullable=True), - sa.Column("created_at", sa.BigInteger(), nullable=False), + 'automation_run', + sa.Column('id', sa.Text(), primary_key=True), + sa.Column('automation_id', sa.Text(), nullable=False), + sa.Column('chat_id', sa.Text(), nullable=True), + sa.Column('status', sa.Text(), nullable=False), + sa.Column('error', sa.Text(), nullable=True), + sa.Column('created_at', sa.BigInteger(), nullable=False), ) op.create_index( - "ix_automation_run_automation_id", - "automation_run", - ["automation_id"], + 'ix_automation_run_automation_id', + 'automation_run', + ['automation_id'], ) def downgrade(): - op.drop_index("ix_automation_run_automation_id") - op.drop_table("automation_run") - op.drop_index("ix_automation_next_run") - op.drop_table("automation") + op.drop_index('ix_automation_run_automation_id') + op.drop_table('automation_run') + op.drop_index('ix_automation_next_run') + op.drop_table('automation') diff --git a/backend/open_webui/models/automations.py b/backend/open_webui/models/automations.py index 05440dd6ee..485f097d5f 100644 --- a/backend/open_webui/models/automations.py +++ b/backend/open_webui/models/automations.py @@ -18,7 +18,7 @@ log = logging.getLogger(__name__) class Automation(Base): - __tablename__ = "automation" + __tablename__ = 'automation' id = Column(Text, primary_key=True) user_id = Column(Text, nullable=False) @@ -32,13 +32,11 @@ class Automation(Base): created_at = Column(BigInteger, nullable=False) updated_at = Column(BigInteger, nullable=False) - __table_args__ = ( - Index("ix_automation_next_run", "next_run_at"), - ) + __table_args__ = (Index('ix_automation_next_run', 'next_run_at'),) class AutomationRun(Base): - __tablename__ = "automation_run" + __tablename__ = 'automation_run' id = Column(Text, primary_key=True) automation_id = Column(Text, nullable=False) @@ -47,9 +45,7 @@ class AutomationRun(Base): error = Column(Text, nullable=True) created_at = Column(BigInteger, nullable=False) - __table_args__ = ( - Index("ix_automation_run_automation_id", "automation_id"), - ) + __table_args__ = (Index('ix_automation_run_automation_id', 'automation_id'),) #################### @@ -119,7 +115,6 @@ class AutomationListResponse(BaseModel): class AutomationTable: - def insert( self, user_id: str, @@ -145,9 +140,7 @@ class AutomationTable: db.refresh(row) return AutomationModel.model_validate(row) - def get_by_id( - self, id: str, db: Optional[Session] = None - ) -> Optional[AutomationModel]: + def get_by_id(self, id: str, db: Optional[Session] = None) -> Optional[AutomationModel]: with get_db_context(db) as db: row = db.get(Automation, id) return AutomationModel.model_validate(row) if row else None @@ -242,9 +235,7 @@ class AutomationTable: db.commit() return True - def claim_due( - self, now_ns: int, limit: int = 10, db: Optional[Session] = None - ) -> list[AutomationModel]: + def claim_due(self, now_ns: int, limit: int = 10, db: Optional[Session] = None) -> list[AutomationModel]: """ Atomically claim due automations for execution. @@ -263,7 +254,7 @@ class AutomationTable: .limit(limit) ) - if db.bind.dialect.name == "postgresql": + if db.bind.dialect.name == 'postgresql': stmt = stmt.with_for_update(skip_locked=True) rows = db.execute(stmt).scalars().all() @@ -272,7 +263,7 @@ class AutomationTable: for row in rows: row.last_run_at = now_ns - row.next_run_at = next_run_ns(row.data.get("rrule", "")) + row.next_run_at = next_run_ns(row.data.get('rrule', '')) db.commit() @@ -285,7 +276,6 @@ class AutomationTable: class AutomationRunTable: - def insert( self, automation_id: str, @@ -308,9 +298,7 @@ class AutomationRunTable: db.refresh(row) return AutomationRunModel.model_validate(row) - def get_latest( - self, automation_id: str, db: Optional[Session] = None - ) -> Optional[AutomationRunModel]: + def get_latest(self, automation_id: str, db: Optional[Session] = None) -> Optional[AutomationRunModel]: with get_db_context(db) as db: row = ( db.query(AutomationRun) @@ -338,15 +326,9 @@ class AutomationRunTable: ) return [AutomationRunModel.model_validate(r) for r in rows] - def delete_by_automation( - self, automation_id: str, db: Optional[Session] = None - ) -> int: + def delete_by_automation(self, automation_id: str, db: Optional[Session] = None) -> int: with get_db_context(db) as db: - count = ( - db.query(AutomationRun) - .filter_by(automation_id=automation_id) - .delete() - ) + count = db.query(AutomationRun).filter_by(automation_id=automation_id).delete() db.commit() return count diff --git a/backend/open_webui/models/chats.py b/backend/open_webui/models/chats.py index 93da2d5736..249393b577 100644 --- a/backend/open_webui/models/chats.py +++ b/backend/open_webui/models/chats.py @@ -402,9 +402,7 @@ class ChatTable: except Exception: return None - def update_chat_last_read_at_by_id( - self, id: str, user_id: str, db: Optional[Session] = None - ) -> bool: + def update_chat_last_read_at_by_id(self, id: str, user_id: str, db: Optional[Session] = None) -> bool: try: with get_db_context(db) as db: chat = db.get(Chat, id) diff --git a/backend/open_webui/routers/automations.py b/backend/open_webui/routers/automations.py index 8f23e47e1b..803f59a6f2 100644 --- a/backend/open_webui/routers/automations.py +++ b/backend/open_webui/routers/automations.py @@ -60,9 +60,7 @@ def check_automation_access(automation, user): ) -def enrich_automation( - automation: AutomationModel, db: Session, tz: str = None -) -> AutomationResponse: +def enrich_automation(automation: AutomationModel, db: Session, tz: str = None) -> AutomationResponse: last_run = AutomationRuns.get_latest(automation.id, db=db) return AutomationResponse( **automation.model_dump(), @@ -100,10 +98,7 @@ async def get_automation_items( ) return { - 'items': [ - enrich_automation(item, db, tz=user.timezone) - for item in result.items - ], + 'items': [enrich_automation(item, db, tz=user.timezone) for item in result.items], 'total': result.total, } @@ -139,9 +134,7 @@ async def create_new_automation( ) tz = user.timezone - automation = Automations.insert( - user.id, form_data, next_run_ns(form_data.data.rrule, tz=tz), db=db - ) + automation = Automations.insert(user.id, form_data, next_run_ns(form_data.data.rrule, tz=tz), db=db) return enrich_automation(automation, db, tz=tz) @@ -198,9 +191,7 @@ async def update_automation_by_id( ) tz = user.timezone - updated = Automations.update_by_id( - id, form_data, next_run_ns(form_data.data.rrule, tz=tz), db=db - ) + updated = Automations.update_by_id(id, form_data, next_run_ns(form_data.data.rrule, tz=tz), db=db) return enrich_automation(updated, db, tz=tz) @@ -219,9 +210,7 @@ async def toggle_automation_by_id( check_automations_permission(request, user) automation = Automations.get_by_id(id, db=db) check_automation_access(automation, user) - toggled = Automations.toggle( - id, next_run_ns(automation.data['rrule'], tz=user.timezone), db=db - ) + toggled = Automations.toggle(id, next_run_ns(automation.data['rrule'], tz=user.timezone), db=db) return enrich_automation(toggled, db, tz=user.timezone) @@ -281,6 +270,3 @@ async def get_automation_runs( automation = Automations.get_by_id(id, db=db) check_automation_access(automation, user) return AutomationRuns.get_by_automation(id, skip=skip, limit=limit, db=db) - - - diff --git a/backend/open_webui/socket/main.py b/backend/open_webui/socket/main.py index e8815f7108..29568d887f 100644 --- a/backend/open_webui/socket/main.py +++ b/backend/open_webui/socket/main.py @@ -501,10 +501,7 @@ async def chat_events(sid, data): event_type = event_data.get('type') if event_type == 'last_read_at': - await asyncio.to_thread( - Chats.update_chat_last_read_at_by_id, - data['chat_id'], user['id'] - ) + await asyncio.to_thread(Chats.update_chat_last_read_at_by_id, data['chat_id'], user['id']) def normalize_document_id(document_id: str) -> str: diff --git a/backend/open_webui/tools/builtin.py b/backend/open_webui/tools/builtin.py index 088319f2e6..4fcdda48c9 100644 --- a/backend/open_webui/tools/builtin.py +++ b/backend/open_webui/tools/builtin.py @@ -2339,9 +2339,9 @@ VALID_TASK_STATUSES = {'pending', 'in_progress', 'completed', 'cancelled'} class TaskItem(BaseModel): - id: Optional[str] = Field(None, description="Unique identifier for the task. Auto-generated if omitted.") - content: Optional[str] = Field(None, description="Task description. Aliases: title, name, description.") - status: Literal['pending', 'in_progress', 'completed', 'cancelled'] = Field('pending', description="Task status.") + id: Optional[str] = Field(None, description='Unique identifier for the task. Auto-generated if omitted.') + content: Optional[str] = Field(None, description='Task description. Aliases: title, name, description.') + status: Literal['pending', 'in_progress', 'completed', 'cancelled'] = Field('pending', description='Task status.') async def tasks( diff --git a/backend/open_webui/utils/automations.py b/backend/open_webui/utils/automations.py index 7a3ea7453e..4d9eb2fb6c 100644 --- a/backend/open_webui/utils/automations.py +++ b/backend/open_webui/utils/automations.py @@ -103,15 +103,11 @@ async def automation_worker_loop(app) -> None: Runs on every instance. Poll interval is configurable via AUTOMATION_POLL_INTERVAL env var (default: 10 seconds). """ - log.info( - f'Automation worker started (poll interval: {AUTOMATION_POLL_INTERVAL}s)' - ) + log.info(f'Automation worker started (poll interval: {AUTOMATION_POLL_INTERVAL}s)') while True: try: with get_db() as db: - batch = Automations.claim_due( - int(time.time_ns()), limit=10, db=db - ) + batch = Automations.claim_due(int(time.time_ns()), limit=10, db=db) if batch: log.info(f'Claimed {len(batch)} due automation(s)') for automation in batch: @@ -120,9 +116,7 @@ async def automation_worker_loop(app) -> None: log.exception('Automation worker error') # Jitter to spread load across instances - await asyncio.sleep( - AUTOMATION_POLL_INTERVAL + random.uniform(0, 2) - ) + await asyncio.sleep(AUTOMATION_POLL_INTERVAL + random.uniform(0, 2)) ########################## @@ -137,16 +131,16 @@ def _build_request(app) -> Request: (model pre-fetch, tool server init) for consistency. """ scope = { - "type": "http", - "asgi": {"version": "3.0", "spec_version": "2.0"}, - "method": "POST", - "path": "/api/v1/automations/internal", - "query_string": b"", - "headers": Headers({}).raw, - "client": ("127.0.0.1", 0), - "server": ("127.0.0.1", 80), - "scheme": "http", - "app": app, + 'type': 'http', + 'asgi': {'version': '3.0', 'spec_version': '2.0'}, + 'method': 'POST', + 'path': '/api/v1/automations/internal', + 'query_string': b'', + 'headers': Headers({}).raw, + 'client': ('127.0.0.1', 0), + 'server': ('127.0.0.1', 80), + 'scheme': 'http', + 'app': app, } request = Request(scope) # Ensure request.state is initialized with required attributes @@ -161,9 +155,9 @@ def _resolve_model_tool_ids(app, model_id: str) -> list[str]: The frontend does this in Chat.svelte (model.info.meta.toolIds). The backend never auto-resolves them, so we must do it explicitly. """ - models = getattr(app.state, "MODELS", {}) + models = getattr(app.state, 'MODELS', {}) model = models.get(model_id, {}) - tool_ids = model.get("info", {}).get("meta", {}).get("toolIds", []) + tool_ids = model.get('info', {}).get('meta', {}).get('toolIds', []) return list(tool_ids) if tool_ids else [] @@ -175,23 +169,23 @@ def _resolve_model_features(app, model_id: str) -> dict: code_interpreter, image_generation when the model has them as defaults AND the capability is enabled AND the admin has enabled the feature. """ - models = getattr(app.state, "MODELS", {}) + models = getattr(app.state, 'MODELS', {}) model = models.get(model_id, {}) - meta = model.get("info", {}).get("meta", {}) + meta = model.get('info', {}).get('meta', {}) - default_feature_ids = meta.get("defaultFeatureIds", []) + default_feature_ids = meta.get('defaultFeatureIds', []) if not default_feature_ids: return {} - capabilities = meta.get("capabilities", {}) + capabilities = meta.get('capabilities', {}) config = app.state.config features = {} # code_interpreter is excluded: it requires the frontend event emitter # and does not work in headless backend execution. feature_checks = { - "web_search": getattr(config, "ENABLE_WEB_SEARCH", False), - "image_generation": getattr(config, "ENABLE_IMAGE_GENERATION", False), + 'web_search': getattr(config, 'ENABLE_WEB_SEARCH', False), + 'image_generation': getattr(config, 'ENABLE_IMAGE_GENERATION', False), } for feature_id in default_feature_ids: @@ -205,15 +199,13 @@ def _resolve_model_features(app, model_id: str) -> dict: def _resolve_model_filter_ids(app, model_id: str) -> list[str]: """Read model default filter_ids from model config.""" - models = getattr(app.state, "MODELS", {}) + models = getattr(app.state, 'MODELS', {}) model = models.get(model_id, {}) - filter_ids = model.get("info", {}).get("meta", {}).get("defaultFilterIds", []) + filter_ids = model.get('info', {}).get('meta', {}).get('defaultFilterIds', []) return list(filter_ids) if filter_ids else [] -async def _set_terminal_cwd( - app, server_id: str, user, cwd: str, chat_id: str -) -> None: +async def _set_terminal_cwd(app, server_id: str, user, cwd: str, chat_id: str) -> None: """Set the working directory on a terminal server via the proxy. Routes through the open-webui terminal proxy endpoint so that @@ -222,9 +214,7 @@ async def _set_terminal_cwd( """ import aiohttp - connections = getattr( - getattr(app, 'state', None), 'config', None - ) + connections = getattr(getattr(app, 'state', None), 'config', None) if connections is None: return connections = getattr(connections, 'TERMINAL_SERVER_CONNECTIONS', None) or [] @@ -253,9 +243,7 @@ async def _set_terminal_cwd( headers['Authorization'] = f'Bearer {connection.get("key", "")}' try: - async with aiohttp.ClientSession( - timeout=aiohttp.ClientTimeout(total=10) - ) as session: + async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=10)) as session: async with session.post( target_url, json={'path': cwd}, @@ -263,10 +251,7 @@ async def _set_terminal_cwd( ) as resp: if resp.status != 200: body = await resp.text() - log.warning( - f'Failed to set terminal CWD to {cwd}: ' - f'HTTP {resp.status} — {body[:200]}' - ) + log.warning(f'Failed to set terminal CWD to {cwd}: HTTP {resp.status} — {body[:200]}') except Exception as e: log.warning(f'Failed to set terminal CWD: {e}') @@ -281,12 +266,12 @@ async def execute_automation(app, automation: AutomationModel) -> None: try: user = Users.get_user_by_id(automation.user_id) if not user: - _record_run(automation.id, "error", error="User not found") + _record_run(automation.id, 'error', error='User not found') return - prompt = prompt_template(automation.data["prompt"], user) - model_id = automation.data["model_id"] - terminal_config = automation.data.get("terminal") + prompt = prompt_template(automation.data['prompt'], user) + model_id = automation.data['model_id'] + terminal_config = automation.data.get('terminal') # Generate proper UUIDs for messages (same as frontend) user_msg_id = str(uuid4()) @@ -297,55 +282,55 @@ async def execute_automation(app, automation: AutomationModel) -> None: automation.user_id, ChatForm( chat={ - "title": automation.name, - "models": [model_id], - "history": { - "currentId": assistant_msg_id, - "messages": { + 'title': automation.name, + 'models': [model_id], + 'history': { + 'currentId': assistant_msg_id, + 'messages': { user_msg_id: { - "id": user_msg_id, - "parentId": None, - "role": "user", - "content": prompt, - "childrenIds": [assistant_msg_id], - "timestamp": int(time.time()), - "models": [model_id], + 'id': user_msg_id, + 'parentId': None, + 'role': 'user', + 'content': prompt, + 'childrenIds': [assistant_msg_id], + 'timestamp': int(time.time()), + 'models': [model_id], }, assistant_msg_id: { - "id": assistant_msg_id, - "parentId": user_msg_id, - "role": "assistant", - "content": "", - "done": False, - "model": model_id, - "childrenIds": [], - "timestamp": int(time.time()), + 'id': assistant_msg_id, + 'parentId': user_msg_id, + 'role': 'assistant', + 'content': '', + 'done': False, + 'model': model_id, + 'childrenIds': [], + 'timestamp': int(time.time()), }, }, }, - "messages": [ - {"role": "user", "content": prompt}, + 'messages': [ + {'role': 'user', 'content': prompt}, ], - "meta": {"automation_id": automation.id}, + 'meta': {'automation_id': automation.id}, } ), ) if not chat: - _record_run(automation.id, "error", error="Failed to create chat") + _record_run(automation.id, 'error', error='Failed to create chat') return # Notify frontend to refresh chat list from open_webui.socket.main import sio await sio.emit( - "events", + 'events', { - "chat_id": chat.id, - "message_id": user_msg_id, - "data": {"type": "chat:list"}, + 'chat_id': chat.id, + 'message_id': user_msg_id, + 'data': {'type': 'chat:list'}, }, - room=f"user:{automation.user_id}", + room=f'user:{automation.user_id}', ) # Resolve model defaults (frontend does this, backend doesn't) @@ -355,31 +340,31 @@ async def execute_automation(app, automation: AutomationModel) -> None: # If a terminal is linked, set the CWD before building the payload terminal_id = None - if terminal_config and terminal_config.get("server_id"): - terminal_id = terminal_config["server_id"] - cwd = terminal_config.get("cwd") + if terminal_config and terminal_config.get('server_id'): + terminal_id = terminal_config['server_id'] + cwd = terminal_config.get('cwd') if cwd: await _set_terminal_cwd(app, terminal_id, user, cwd, chat.id) # Build the same payload the frontend sends to /api/chat/completions form_data = { - "model": model_id, - "messages": [{"role": "user", "content": prompt}], - "stream": True, - "chat_id": chat.id, - "id": assistant_msg_id, - "parent_id": user_msg_id, - "session_id": f"automation:{automation.id}", - "background_tasks": {}, + 'model': model_id, + 'messages': [{'role': 'user', 'content': prompt}], + 'stream': True, + 'chat_id': chat.id, + 'id': assistant_msg_id, + 'parent_id': user_msg_id, + 'session_id': f'automation:{automation.id}', + 'background_tasks': {}, } if tool_ids: - form_data["tool_ids"] = tool_ids + form_data['tool_ids'] = tool_ids if features: - form_data["features"] = features + form_data['features'] = features if filter_ids: - form_data["filter_ids"] = filter_ids + form_data['filter_ids'] = filter_ids if terminal_id: - form_data["terminal_id"] = terminal_id + form_data['terminal_id'] = terminal_id # Call the full chat completion pipeline (same as POST /api/chat/completions). # The handler reference is stored on app.state to avoid circular imports. @@ -390,21 +375,21 @@ async def execute_automation(app, automation: AutomationModel) -> None: from open_webui.socket.main import sio await sio.emit( - "automation:result", + 'automation:result', { - "automation_id": automation.id, - "name": automation.name, - "chat_id": chat.id, - "status": "success", + 'automation_id': automation.id, + 'name': automation.name, + 'chat_id': chat.id, + 'status': 'success', }, - room=f"user:{automation.user_id}", + room=f'user:{automation.user_id}', ) - _record_run(automation.id, "success", chat_id=chat.id) + _record_run(automation.id, 'success', chat_id=chat.id) except Exception as e: - log.exception(f"Automation {automation.id} failed") - _record_run(automation.id, "error", error=str(e)[:4000]) + log.exception(f'Automation {automation.id} failed') + _record_run(automation.id, 'error', error=str(e)[:4000]) #################### @@ -420,6 +405,4 @@ def _record_run( ): """Insert a run record into automation_run.""" with get_db() as db: - AutomationRuns.insert( - automation_id, status, chat_id=chat_id, error=error, db=db - ) + AutomationRuns.insert(automation_id, status, chat_id=chat_id, error=error, db=db) diff --git a/backend/open_webui/utils/mcp/client.py b/backend/open_webui/utils/mcp/client.py index 79221f4463..13745aa9f5 100644 --- a/backend/open_webui/utils/mcp/client.py +++ b/backend/open_webui/utils/mcp/client.py @@ -56,7 +56,9 @@ class MCPClient: self._streams_context = streamablehttp_client( url, headers=headers, - httpx_client_factory=create_httpx_client if AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL else create_insecure_httpx_client, + httpx_client_factory=create_httpx_client + if AIOHTTP_CLIENT_SESSION_TOOL_SERVER_SSL + else create_insecure_httpx_client, ) transport = await exit_stack.enter_async_context(self._streams_context) diff --git a/backend/open_webui/utils/middleware.py b/backend/open_webui/utils/middleware.py index 4d727be93f..dfc74e4218 100644 --- a/backend/open_webui/utils/middleware.py +++ b/backend/open_webui/utils/middleware.py @@ -2759,11 +2759,7 @@ def get_event_emitter_and_caller(metadata): # event_caller needs session_id — it calls back to a specific # websocket session (used by direct tools, pyodide code interpreter). - if ( - metadata.get('session_id') - and metadata.get('chat_id') - and metadata.get('message_id') - ): + if metadata.get('session_id') and metadata.get('chat_id') and metadata.get('message_id'): event_caller = get_event_call(metadata) return event_emitter, event_caller @@ -3642,10 +3638,10 @@ async def streaming_chat_response_handler(response, ctx): if error: try: Chats.upsert_message_to_chat_by_id_and_message_id( - metadata["chat_id"], - metadata["message_id"], + metadata['chat_id'], + metadata['message_id'], { - "error": {"content": error}, + 'error': {'content': error}, }, ) except Exception: diff --git a/src/lib/apis/automations/index.ts b/src/lib/apis/automations/index.ts index e023098907..a79fe1ddc8 100644 --- a/src/lib/apis/automations/index.ts +++ b/src/lib/apis/automations/index.ts @@ -49,7 +49,6 @@ export type AutomationResponse = { next_runs: number[] | null; }; - export const getAutomationItems = async ( token: string, query: string | null, diff --git a/src/lib/apis/terminal/index.ts b/src/lib/apis/terminal/index.ts index de2e2fd5a6..69ee2c5a0a 100644 --- a/src/lib/apis/terminal/index.ts +++ b/src/lib/apis/terminal/index.ts @@ -45,7 +45,11 @@ export const getTerminalConfig = async ( return res.json().catch(() => null); }; -export const getCwd = async (baseUrl: string, apiKey: string, sessionId?: string): Promise => { +export const getCwd = async ( + baseUrl: string, + apiKey: string, + sessionId?: string +): Promise => { const url = `${baseUrl.replace(/\/$/, '')}/files/cwd`; const headers: Record = { Authorization: `Bearer ${apiKey}` }; if (sessionId) headers['X-Session-Id'] = sessionId; diff --git a/src/lib/components/AutomationModal.svelte b/src/lib/components/AutomationModal.svelte index f829743d77..c1843f20e7 100644 --- a/src/lib/components/AutomationModal.svelte +++ b/src/lib/components/AutomationModal.svelte @@ -155,17 +155,9 @@
- + - + {$i18n.t('Execution Logs')}
-
+
{#if runsLoading && runs.length === 0}
diff --git a/src/lib/components/automations/TerminalDropdown.svelte b/src/lib/components/automations/TerminalDropdown.svelte index 206673db58..6404823a65 100644 --- a/src/lib/components/automations/TerminalDropdown.svelte +++ b/src/lib/components/automations/TerminalDropdown.svelte @@ -30,9 +30,7 @@ - - - {/if} - - {#if onReply} - - - - {/if} + + + + + {/if} - - - + {#if onReply} + + + + {/if} - {#if !thread && onThread} - + - {/if} - {#if message.user_id === $user?.id || $user?.role === 'admin'} - {#if onEdit} - + {#if !thread && onThread} + {/if} - {#if onDelete} - - - + {#if message.user_id === $user?.id || $user?.role === 'admin'} + {#if onEdit} + + + + {/if} + + {#if onDelete} + + + + {/if} {/if} - {/if} -
-
- {/if} - - {#if message?.is_pinned} -
-
- - {$i18n.t('Pinned')} -
-
- {/if} - - {#if message?.reply_to_message?.user} -
-
- -
+ {/if} -
- + {#if message?.is_pinned} +
+
+ + {$i18n.t('Pinned')}
- -
- {/if} +
+ {/if} -
-
- {#if showUserProfile} - {#if message?.meta?.model_id} - {message.meta.model_name { - e.currentTarget.src = '/favicon.png'; - }} - /> - {:else if message.user?.role === 'webhook'} - - {:else} - + {#if message?.reply_to_message?.user} +
+
+ + +
+ {/if} + +
+
+ {#if showUserProfile} + {#if message?.meta?.model_id} + {message.meta.model_name { + e.currentTarget.src = '/favicon.png'; + }} + /> + {:else if message.user?.role === 'webhook'} - - {/if} - {:else} - - - {#if message.created_at} - - {/if} - {/if} -
- -
- {#if showUserProfile} - -
- {#if message?.meta?.model_id} - {message?.meta?.model_name ?? message?.meta?.model_id} - {:else} - {message?.user?.name} - {/if} -
+ {:else} + + + + {/if} + {:else} + {#if message.created_at}
- - {#if dayjs(message.created_at / 1000000).isToday()} - {dayjs(message.created_at / 1000000).format('LT')} - {:else} - {$i18n.t(formatDate(message.created_at / 1000000), { - LOCALIZED_TIME: dayjs(message.created_at / 1000000).format('LT'), - LOCALIZED_DATE: dayjs(message.created_at / 1000000).format('L') - })} - {/if} - + {dayjs(message.created_at / 1000000).format('HH:mm')}
{/if} - - {/if} + {/if} +
- {#if message?.data === true} - -
- -
- {:else if (message?.data?.files ?? []).length > 0} -
- {#each message?.data?.files as file} - {@const fileUrl = - file.url.startsWith('data') || file.url.startsWith('http') - ? file.url - : `${WEBUI_API_BASE_URL}/files/${file.url}${file?.content_type ? '/content' : ''}`} -
- {#if file.type === 'image' || (file?.content_type ?? '').startsWith('image/')} - {file.name} - {:else if file.type === 'video' || (file?.content_type ?? '').startsWith('video/')} - +
+ {#if showUserProfile} + +
+ {#if message?.meta?.model_id} + {message?.meta?.model_name ?? message?.meta?.model_id} {:else} - + {message?.user?.name} {/if}
- {/each} -
- {/if} - {#if edit} -
-