mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-09-18 23:57:20 +00:00
Merge remote-tracking branch 'origin/master' into dev/4.11.x
# Conflicts: # pyproject.toml # src/langbot/pkg/pipeline/controller.py # uv.lock # web/src/app/home/bots/components/bot-form/BotForm.tsx # web/src/app/home/components/home-sidebar/HomeSidebar.tsx # web/src/app/home/components/home-sidebar/SidebarDataContext.tsx # web/src/app/home/plugin-pages/page.tsx # web/src/app/infra/entities/api/index.ts
This commit is contained in:
@@ -0,0 +1,57 @@
|
||||
"""add durable replay protection for signed Space launch assertions
|
||||
|
||||
Revision ID: 0016_space_launch_replay
|
||||
Revises: 0015_cloud_core_collab
|
||||
Create Date: 2026-07-31
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision = '0016_space_launch_replay'
|
||||
down_revision = '0015_cloud_core_collab'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
_TABLE = 'space_launch_assertion_consumptions'
|
||||
_POLICY = 'langbot_directory_projection'
|
||||
_SETTING = "NULLIF(current_setting('langbot.directory_instance_uuid', true), '')"
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
conn = op.get_bind()
|
||||
if _TABLE not in set(sa.inspect(conn).get_table_names()):
|
||||
op.create_table(
|
||||
_TABLE,
|
||||
sa.Column('instance_uuid', sa.String(255), nullable=False),
|
||||
sa.Column('jti', sa.String(255), nullable=False),
|
||||
sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column('consumed_at', sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('instance_uuid', 'jti'),
|
||||
)
|
||||
op.create_index(
|
||||
'ix_space_launch_assertion_consumptions_expiry',
|
||||
_TABLE,
|
||||
['instance_uuid', 'expires_at'],
|
||||
unique=False,
|
||||
)
|
||||
if conn.dialect.name == 'postgresql':
|
||||
table = conn.dialect.identifier_preparer.quote(_TABLE)
|
||||
policy = conn.dialect.identifier_preparer.quote(_POLICY)
|
||||
expression = f'instance_uuid::text = {_SETTING}'
|
||||
op.execute(sa.text(f'ALTER TABLE {table} ENABLE ROW LEVEL SECURITY'))
|
||||
op.execute(sa.text(f'ALTER TABLE {table} FORCE ROW LEVEL SECURITY'))
|
||||
op.execute(sa.text(f'DROP POLICY IF EXISTS {policy} ON {table}'))
|
||||
op.execute(
|
||||
sa.text(
|
||||
f'CREATE POLICY {policy} ON {table} AS PERMISSIVE FOR ALL TO PUBLIC '
|
||||
f'USING ({expression}) WITH CHECK ({expression})'
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
if _TABLE in set(sa.inspect(op.get_bind()).get_table_names()):
|
||||
op.drop_table(_TABLE)
|
||||
@@ -0,0 +1,21 @@
|
||||
"""merge the published Space launch replay and main migration branches
|
||||
|
||||
Revision ID: 0018_merge_launch_replay
|
||||
Revises: 0016_space_launch_replay, 0017_oss_workspace_identity
|
||||
Create Date: 2026-08-01
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
revision = '0018_merge_launch_replay'
|
||||
down_revision = ('0016_space_launch_replay', '0017_oss_workspace_identity')
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
pass
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
pass
|
||||
@@ -0,0 +1,80 @@
|
||||
"""enforce one active owner per Workspace
|
||||
|
||||
Revision ID: 0019_single_workspace_owner
|
||||
Revises: 0018_merge_launch_replay
|
||||
Create Date: 2026-08-02
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
|
||||
revision = '0019_single_workspace_owner'
|
||||
down_revision = '0018_merge_launch_replay'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
_INDEX_NAME = 'uq_workspace_memberships_one_active_owner'
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
if 'workspace_memberships' not in inspector.get_table_names():
|
||||
return
|
||||
|
||||
# Ownership transfer used to promote a second member without demoting the
|
||||
# original owner. Preserve the Workspace creator where possible and demote
|
||||
# every historical extra owner before installing the database invariant.
|
||||
op.execute(
|
||||
sa.text(
|
||||
"""
|
||||
WITH ranked_owners AS (
|
||||
SELECT membership.uuid,
|
||||
ROW_NUMBER() OVER (
|
||||
PARTITION BY membership.workspace_uuid
|
||||
ORDER BY
|
||||
CASE
|
||||
WHEN membership.account_uuid = workspace.created_by_account_uuid THEN 0
|
||||
ELSE 1
|
||||
END,
|
||||
COALESCE(membership.joined_at, membership.created_at),
|
||||
membership.uuid
|
||||
) AS owner_rank
|
||||
FROM workspace_memberships AS membership
|
||||
JOIN workspaces AS workspace
|
||||
ON workspace.uuid = membership.workspace_uuid
|
||||
WHERE membership.role = 'owner'
|
||||
AND membership.status = 'active'
|
||||
)
|
||||
UPDATE workspace_memberships
|
||||
SET role = 'admin'
|
||||
WHERE uuid IN (
|
||||
SELECT uuid
|
||||
FROM ranked_owners
|
||||
WHERE owner_rank > 1
|
||||
)
|
||||
"""
|
||||
)
|
||||
)
|
||||
# Fresh installations may already have this index because SQLAlchemy
|
||||
# metadata is created before Alembic advances the revision marker.
|
||||
op.execute(
|
||||
sa.text(
|
||||
'CREATE UNIQUE INDEX IF NOT EXISTS '
|
||||
'uq_workspace_memberships_one_active_owner '
|
||||
'ON workspace_memberships (workspace_uuid) '
|
||||
"WHERE role = 'owner' AND status = 'active'"
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
conn = op.get_bind()
|
||||
inspector = sa.inspect(conn)
|
||||
if 'workspace_memberships' not in inspector.get_table_names():
|
||||
return
|
||||
index_names = {index['name'] for index in inspector.get_indexes('workspace_memberships')}
|
||||
if _INDEX_NAME in index_names:
|
||||
op.drop_index(_INDEX_NAME, table_name='workspace_memberships')
|
||||
@@ -0,0 +1,21 @@
|
||||
"""merge AgentRunner and Cloud Workspace migration heads
|
||||
|
||||
Revision ID: 0020_merge_agent_cloud_heads
|
||||
Revises: 0018_merge_workspace_heads, 0019_single_workspace_owner
|
||||
Create Date: 2026-08-04
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
revision = '0020_merge_agent_cloud_heads'
|
||||
down_revision = ('0018_merge_workspace_heads', '0019_single_workspace_owner')
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
pass
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
pass
|
||||
@@ -210,7 +210,7 @@ _ALLOWED_SCOPED_BUILTIN_FUNCTION_TYPES = {
|
||||
'now': sqlalchemy.sql.functions.now,
|
||||
'sum': sqlalchemy.sql.functions.sum,
|
||||
}
|
||||
_ALLOWED_SCOPED_GENERIC_FUNCTIONS = frozenset({'length', 'nullif'})
|
||||
_ALLOWED_SCOPED_GENERIC_FUNCTIONS = frozenset({'date_trunc', 'length', 'nullif'})
|
||||
_ALLOWED_SCOPED_CUSTOM_OPERATORS = frozenset({'<=>'})
|
||||
_ALLOWED_SCOPED_STATEMENT_TYPES = (
|
||||
sqlalchemy.sql.dml.UpdateBase,
|
||||
|
||||
Reference in New Issue
Block a user