soliplex 0.70.2__tar.gz → 0.71__tar.gz

{soliplex-0.70.2/src/soliplex.egg-info → soliplex-0.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soliplex
-Version: 0.70.2
+Version: 0.71
 Summary: An AI-powered Retrieval-Augmented Generation (RAG) system with a modern web interface.
 Author-email: Enfold <info@enfoldsystems.net>
 Classifier: Programming Language :: Python :: 3
@@ -19,7 +19,7 @@ Requires-Dist: fastapi
 Requires-Dist: fastmcp<3.4,>=3.3.0
 Requires-Dist: fakeredis!=2.35.0
 Requires-Dist: greenlet
-Requires-Dist: haiku.rag-slim<0.64,>=0.63.1
+Requires-Dist: haiku.rag-slim<0.65,>=0.64
 Requires-Dist: haiku-skills<0.19,>=0.18.0
 Requires-Dist: idna>=3.15
 Requires-Dist: itsdangerous

{soliplex-0.70.2 → soliplex-0.71}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soliplex"
-version = "0.70.2"
+version = "0.71"
 description = "An AI-powered Retrieval-Augmented Generation (RAG) system with a modern web interface."
 authors = [{ name = "Enfold", email = "info@enfoldsystems.net" }]
 readme = "README.md"
@@ -25,7 +25,7 @@ dependencies = [
     "fastmcp >= 3.3.0, < 3.4",
     "fakeredis != 2.35.0",  # brownbag
     "greenlet",
-    "haiku.rag-slim >= 0.63.1, < 0.64",
+    "haiku.rag-slim >= 0.64, < 0.65",
     "haiku-skills >= 0.18.0, < 0.19",
     "idna >= 3.15",
     "itsdangerous",
@@ -92,7 +92,6 @@ markers = [
 [tool.coverage.run]
 omit = [
     "src/soliplex/cli/__init__.py",
-    "src/soliplex/cli/serve.py",
 
     "src/soliplex/examples.py",
     "src/soliplex/tui.py",

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/agents.py

@@ -11,7 +11,7 @@ from pydantic_ai import agent as ai_agent
 from pydantic_ai import tools as ai_tools
 from pydantic_ai import toolsets as ai_toolsets
 
-from soliplex import agui as agui_package
+from soliplex import agui
 from soliplex import mcp_client
 from soliplex import models
 from soliplex.config import agents as config_agents
@@ -41,8 +41,8 @@ class AgentDependencies:
     """
 
     the_installation: typing.Any  # installation.Installation
-    the_threads: agui_package.ThreadStorage = None
-    state: agui_package.AGUI_State = dataclasses.field(default_factory=dict)
+    the_threads: agui.ThreadStorage = None
+    state: agui.AGUI_State = dataclasses.field(default_factory=dict)
     room_id: str | None = None
     thread_id: str | None = None
     run_id: str | None = None

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/agui/__init__.py

@@ -587,7 +587,11 @@ async def get_the_threads(request: fastapi.Request) -> ThreadStorage:
 
     engine = request.state.threads_engine
     async with sqla_asyncio.AsyncSession(bind=engine) as session:
-        yield persistence.ThreadStorage(session)
+        # One transaction per request: the storage methods no longer
+        # commit, so the request owns the unit of work -- committed on a
+        # clean response, rolled back if the handler raises.
+        async with session.begin():
+            yield persistence.ThreadStorage(session)
 
 
 depend_the_threads = fastapi.Depends(get_the_threads)

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/agui/parser.py

@@ -10,7 +10,7 @@ from collections import abc
 import jsonpatch
 from ag_ui import core as agui_core
 
-from soliplex import agui as agui_package
+from soliplex import agui
 
 AGUI_EventIterator = abc.AsyncIterator[agui_core.Event]
 AGUI_EventDictIterator = abc.AsyncIterator[agui_core.Event]
@@ -230,12 +230,12 @@ DEFAULT_STRIPPED_MESSAGE_TYPES: StrippedMessageTypes = None
 @dataclasses.dataclass
 class EventStreamParser:
     run_agent_input: dataclasses.InitVar[agui_core.RunAgentInput] = None
-    run: dataclasses.InitVar[agui_package.Run] = None
+    run: dataclasses.InitVar[agui.Run] = None
 
     _ = dataclasses.KW_ONLY
 
     _run_input: agui_core.RunAgentInput = None
-    _the_run: agui_package.Run = None
+    _the_run: agui.Run = None
 
     run_status: RunStatus = RunStatus.INITIALIZED
     active_steps: set[str] = dataclasses.field(default_factory=set)
@@ -282,7 +282,7 @@ class EventStreamParser:
         self.messages_by_id = {msg.id: msg for msg in value.messages}
 
     @property
-    def the_run(self) -> agui_package.Run:
+    def the_run(self) -> agui.Run:
         return self._the_run
 
     def _assert_running(self, event):

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/agui/persistence.py

@@ -8,7 +8,7 @@ from ag_ui import core as agui_core
 from sqlalchemy import sql as sqla_sql
 from sqlalchemy.ext import asyncio as sqla_asyncio
 
-from soliplex import agui as agui_package
+from soliplex import agui
 from soliplex.agui import persistence as agui_persistence
 from soliplex.agui import schema as agui_schema
 from soliplex.agui import util as agui_util
@@ -16,7 +16,7 @@ from soliplex.agui import util as agui_util
 # Temporary backward-compatibility:  to be removed in 'v0.45'
 from soliplex.agui.schema import *  # noqa F403
 
-FeedbackReviewStatus = agui_package.FeedbackReviewStatus
+FeedbackReviewStatus = agui.FeedbackReviewStatus
 
 
 class NoFeedbackFound(ValueError):
@@ -48,15 +48,19 @@ _LAST_ACTIVITY = sqla_sql.func.max(
 )
 
 
-class ThreadStorage(agui_package.ThreadStorage):
+class ThreadStorage(agui.ThreadStorage):
     def __init__(self, session: sqla_asyncio.AsyncSession):
         self._session = session
 
     @property
     @contextlib.asynccontextmanager
     async def session(self):
-        async with self._session.begin():
-            yield self._session
+        # Yield the caller-owned session as-is: the session owner (a
+        # FastAPI dependency, CLI context manager, or streaming helper)
+        # owns the transaction boundary and commits the unit of work
+        # exactly once. Methods here never open their own transaction or
+        # commit, so callers -- and tests -- need no interleaved commits.
+        yield self._session
 
     async def _find_user_thread(
         self,
@@ -74,12 +78,12 @@ class ThreadStorage(agui_package.ThreadStorage):
         thread = (await session.scalars(query)).first()
 
         if thread is None:
-            raise agui_package.UnknownThread(user_name, thread_id)
+            raise agui.UnknownThread(user_name, thread_id)
 
         t_room_id = await thread.awaitable_attrs.room_id
 
         if t_room_id != room_id:
-            raise agui_package.ThreadRoomMismatch(room_id, t_room_id)
+            raise agui.ThreadRoomMismatch(room_id, t_room_id)
 
         return thread
 
@@ -91,7 +95,7 @@ class ThreadStorage(agui_package.ThreadStorage):
         thread_id: str,
         run_id: str,
         session,
-        exc_type=agui_package.UnknownRun,
+        exc_type=agui.UnknownRun,
     ):
         thread = await self._find_user_thread(
             user_name=user_name,
@@ -294,7 +298,7 @@ class ThreadStorage(agui_package.ThreadStorage):
                     thread_id=thread_id,
                     run_id=parent_run_id,
                     session=session,
-                    exc_type=agui_package.MissingParentRun,
+                    exc_type=agui.MissingParentRun,
                 )
             else:
                 parent = None
@@ -362,7 +366,7 @@ class ThreadStorage(agui_package.ThreadStorage):
             already = await run.awaitable_attrs.run_agent_input
 
             if already is not None:
-                raise agui_package.RunAlreadyStarted(
+                raise agui.RunAlreadyStarted(
                     user_name,
                     thread_id,
                     run_id,
@@ -420,8 +424,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         event: agui_core.Event,
     ) -> None:
         """Save a single event for a run (incremental persistence)"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -448,8 +450,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         run_id: str,
     ) -> None:
         """Mark a run as finished"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -475,8 +475,6 @@ class ThreadStorage(agui_package.ThreadStorage):
 
         Each element is a (event_index, event) tuple.
         """
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -504,8 +502,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         run_id: str,
     ) -> bool:
         """Return True if the run has a 'finished' timestamp"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -524,11 +520,9 @@ class ThreadStorage(agui_package.ThreadStorage):
         room_id: str,
         thread_id: str,
         run_id: str,
-        events: agui_package.AGUI_Events,
-    ) -> agui_package.AGUI_Events:
+        events: agui.AGUI_Events,
+    ) -> agui.AGUI_Events:
         """Save the events for a gven run"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -560,8 +554,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         tool_calls: int,
     ):
         """Save the run usage statistics"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -591,8 +583,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         reason: str,
     ):
         """Save the run feedback"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -624,10 +614,8 @@ class ThreadStorage(agui_package.ThreadStorage):
         room_id: str,
         thread_id: str,
         run_id: str,
-    ) -> agui_package.RunFeedbackType | None:
+    ) -> agui.RunFeedbackType | None:
         """Get the run feedback"""
-        await self._session.commit()
-
         async with self.session as session:
             run = await self._find_thread_run(
                 user_name=user_name,
@@ -658,8 +646,6 @@ class ThreadStorage(agui_package.ThreadStorage):
         if limit is None and since is None:
             limit = 20
 
-        await self._session.commit()
-
         async with self.session as session:
             query = (
                 sqla_sql.Select(

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/agui/schema.py

@@ -12,7 +12,7 @@ from sqlalchemy import schema as sqla_schema
 from sqlalchemy.ext import asyncio as sqla_asyncio
 from sqlalchemy.sql import sqltypes as sqla_sqltypes
 
-from soliplex import agui as agui_package
+from soliplex import agui
 from soliplex import util
 from soliplex.agui import util as agui_util
 from soliplex.config import installation as config_installation
@@ -42,7 +42,7 @@ JSON_Mapped_From = dict[str, typing.Any]
 
 metadata = sqla_schema.MetaData(naming_convention=NAMING_CONVENTION)
 
-FeedbackReviewStatus = agui_package.FeedbackReviewStatus
+FeedbackReviewStatus = agui.FeedbackReviewStatus
 
 
 class Base(AsyncAttrs, DeclarativeBase):
@@ -447,8 +447,8 @@ class RunUsage(Base):
     requests: Mapped[int] = mapped_column()
     tool_calls: Mapped[int] = mapped_column()
 
-    def as_tuple(self) -> agui_package.RunUsageStats:
-        return agui_package.RunUsageStats(
+    def as_tuple(self) -> agui.RunUsageStats:
+        return agui.RunUsageStats(
             self.input_tokens,
             self.output_tokens,
             self.requests,

{soliplex-0.70.2 → soliplex-0.71}/src/soliplex/authz/__init__.py

@@ -6,9 +6,7 @@ import json
 import re
 import typing
 
-import fastapi
 import jsonpath
-from sqlalchemy.ext import asyncio as sqla_asyncio
 
 # Avoid circular import when only used for typing
 # from soliplex import models
@@ -85,6 +83,40 @@ class ExactlyOneDiscriminator(ValueError):
         )
 
 
+class NoSuchAdminUser(ValueError):
+    """Raised when no admin user matches a given JSONPath discriminator."""
+
+    def __init__(self, json_path):
+        self.json_path = json_path
+        super().__init__(f"No admin user exists with json_path: {json_path}")
+
+
+class AdminUserExists(ValueError):
+    """Raised when an admin user already exists for a discriminator."""
+
+    def __init__(self, json_path):
+        self.json_path = json_path
+        super().__init__(
+            f"Admin user already exists with json_path: {json_path}"
+        )
+
+
+class NoSuchRoomPolicy(ValueError):
+    """Raised when no authorization policy exists for a room."""
+
+    def __init__(self, room_id):
+        self.room_id = room_id
+        super().__init__(f"No policy exists for room: {room_id}")
+
+
+class NoSuchACLEntry(ValueError):
+    """Raised when no stored ACL entry matches a room operation."""
+
+    def __init__(self, room_id):
+        self.room_id = room_id
+        super().__init__(f"No matching ACL entry in room: {room_id}")
+
+
 def validate_json_path(value: str | None) -> str | None:
     """Validate a JSONPath query string.
 
@@ -144,24 +176,59 @@ class AllowDeny(enum.Enum):
     DENY = "deny"
 
 
-class AuthorizationPolicy(abc.ABC):
-    """Protocol for checking / managing authorization policies"""
+class AdminUserPolicy(abc.ABC):
+    """Protocol for checking / managing admin-user discriminators."""
 
     @abc.abstractmethod
-    async def list_admin_users(self) -> list[str]:
-        """List admin users in the admin users table.
+    async def list_admin_user_discriminators(self) -> list[str]:
+        """List JSONPath discriminators which identify admin users.
+
+        Discriminators may be tied to individuals (e.g., via their
+        email addresses), or to claims which identify groups or
+        roles attached to the user.
+        """
+
+    @abc.abstractmethod
+    async def add_admin_user_discriminator(self, json_path: str):
+        """Add a user discriminator to the admin users table.
+
+        Discriminators may be tied to individuals (e.g., via their
+        email addresses), or to claims which identify groups or
+        roles attached to the user.
+        """
 
-        Email-keyed admins surface as their email; admins keyed by a
-        non-email JSONPath query surface as the raw query string.
+    @abc.abstractmethod
+    async def remove_admin_user_discriminator(self, json_path: str):
+        """Remove a user discriminator from the admin users table.
+
+        Discriminators may be tied to individuals (e.g., via their
+        email addresses), or to claims which identify groups or
+        roles attached to the user.
         """
 
+    @abc.abstractmethod
+    async def clear_admin_user_discriminators(self):
+        """Remove all admin user discriminators from the admin users table."""
+
+    @abc.abstractmethod
+    async def list_admin_users(self) -> list[str]:
+        """Deprecated alias for 'list_admin_user_discriminators'."""
+
     @abc.abstractmethod
     async def add_admin_user(self, email: str):
-        """Add a user to the admin users table."""
+        """Deprecated alias for 'add_admin_user_discriminator'.
+
+        Translates 'email' to the equivalent JSONPath expression,
+        '$[?$.email == "..."]', then delegates.
+        """
 
     @abc.abstractmethod
     async def remove_admin_user(self, email: str):
-        """Remove a user from the admin users table."""
+        """Deprecated alias for 'remove_admin_user_discriminator'.
+
+        Translates 'email' to the equivalent JSONPath expression,
+        '$[?$.email == "..."]', then delegates.
+        """
 
     @abc.abstractmethod
     async def check_admin_access(self, user_token: UserToken) -> bool:
@@ -171,6 +238,10 @@ class AuthorizationPolicy(abc.ABC):
         the user is an admin when any query matches.
         """
 
+
+class RoomAuthorizationPolicy(abc.ABC):
+    """Protocol for checking / managing room authorization policies."""
+
     @abc.abstractmethod
     async def check_room_access(
         self,
@@ -191,7 +262,6 @@ class AuthorizationPolicy(abc.ABC):
     async def get_room_policy(
         self,
         room_id: str,
-        user_token: UserToken,
     ) -> models.RoomPolicy | None:  # noqa: F821
         """Return the authorization policy for the room"""
 
@@ -200,7 +270,6 @@ class AuthorizationPolicy(abc.ABC):
         self,
         room_id: str,
         room_policy: models.RoomPolicy,  # noqa: F821
-        user_token: UserToken,
     ) -> None:
         """Update the authorization policy for the room"""
 
@@ -208,19 +277,58 @@ class AuthorizationPolicy(abc.ABC):
     async def delete_room_policy(
         self,
         room_id: str,
-        user_token: UserToken,
     ) -> None:
         """Delete the authorization policy for the room"""
 
+    @abc.abstractmethod
+    async def get_room_policy_unchecked(
+        self,
+        room_id: str,
+    ) -> models.RoomPolicyUnchecked | None:  # noqa: F821
+        """Return the room policy, tolerating non-compiling 'json_path's."""
+
+    @abc.abstractmethod
+    async def list_room_policies(
+        self,
+    ) -> list[models.RoomPolicyUnchecked]:  # noqa: F821
+        """List every stored room policy as an unchecked model.
+
+        Each policy is returned as the unchecked model -- the analogue
+        of 'get_room_policy_unchecked' over the whole table -- so a
+        stored ACL entry whose 'json_path' no longer compiles is
+        surfaced rather than raising, exactly what an audit needs. The
+        order is unspecified.
+        """
+
+    @abc.abstractmethod
+    async def clear_room_acl(self, room_id: str) -> None:
+        """Remove all ACL entries from the room's policy.
 
-async def get_the_authz_policy(
-    request: fastapi.Request,
-) -> AuthorizationPolicy:
-    from . import persistence
+        The policy row and its 'default_allow_deny' are preserved.
+        """
 
-    engine = request.state.authorization_engine
-    async with sqla_asyncio.AsyncSession(bind=engine) as session:
-        yield persistence.AuthorizationPolicy(session)
+    @abc.abstractmethod
+    async def add_acl_entry(
+        self,
+        room_id: str,
+        entry: models.ACLEntry,  # noqa: F821
+    ) -> None:
+        """Add an ACL entry to the room's policy, replacing any entry with
+        the same discriminator."""
 
+    @abc.abstractmethod
+    async def remove_acl_entry(
+        self,
+        room_id: str,
+        entry: models.ACLEntryUnchecked,  # noqa: F821
+    ) -> None:
+        """Remove the matching ACL entry from the room's policy."""
 
-depend_the_authz_policy = fastapi.Depends(get_the_authz_policy)
+    @abc.abstractmethod
+    async def set_room_default(
+        self,
+        room_id: str,
+        allow_deny: AllowDeny,
+    ) -> None:
+        """Set the room policy's 'default_allow_deny', creating an empty
+        policy if none exists."""