databricks-tellr-app 0.4.2.dev3__tar.gz → 0.4.2.dev5__tar.gz

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.2.dev3
+Version: 0.4.2.dev5
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/databricks_tellr_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: databricks-tellr-app
-Version: 0.4.2.dev3
+Version: 0.4.2.dev5
 Summary: Tellr application package for Databricks Apps
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/databricks_tellr_app.egg-info/SOURCES.txt

@@ -37,7 +37,6 @@ setup.py
 ./src/api/routes/settings/__init__.py
 ./src/api/routes/settings/contributors.py
 ./src/api/routes/settings/deck_prompts.py
-./src/api/routes/settings/design_systems.py
 ./src/api/routes/settings/identities.py
 ./src/api/routes/settings/slide_styles.py
 ./src/api/schemas/__init__.py
@@ -56,6 +55,7 @@ setup.py
 ./src/api/services/job_queue.py
 ./src/api/services/session_manager.py
 ./src/api/services/session_naming.py
+./src/api/services/slide_repository.py
 ./src/api/services/usage_events.py
 ./src/api/services/usage_service.py
 ./src/api/utils/__init__.py
@@ -78,10 +78,8 @@ setup.py
 ./src/core/settings_db.py
 ./src/core/user_context.py
 ./src/database/__init__.py
-./src/database/types.py
 ./src/database/models/__init__.py
 ./src/database/models/deck_contributor.py
-./src/database/models/design_system.py
 ./src/database/models/encryption_key.py
 ./src/database/models/feedback.py
 ./src/database/models/genie_space.py
@@ -106,9 +104,6 @@ setup.py
 ./src/services/agent_factory.py
 ./src/services/config_service.py
 ./src/services/config_validator.py
-./src/services/design_system_compiler.py
-./src/services/design_system_service.py
-./src/services/design_system_templates.py
 ./src/services/drive_uploader.py
 ./src/services/genie_service.py
 ./src/services/google_slides_auth.py
@@ -140,14 +135,12 @@ setup.py
 ./src/services/identity_providers/workspace_provider.py
 ./src/services/tools/__init__.py
 ./src/services/tools/agent_bricks_tool.py
-./src/services/tools/ds_asset_tool.py
 ./src/services/tools/genie_tool.py
 ./src/services/tools/mcp_tool.py
 ./src/services/tools/model_endpoint_tool.py
 ./src/services/tools/vector_tool.py
 ./src/utils/__init__.py
 ./src/utils/css_utils.py
-./src/utils/ds_asset_utils.py
 ./src/utils/error_handling.py
 ./src/utils/html_safety.py
 ./src/utils/html_utils.py
@@ -199,7 +192,6 @@ src/api/routes/version.py
 src/api/routes/settings/__init__.py
 src/api/routes/settings/contributors.py
 src/api/routes/settings/deck_prompts.py
-src/api/routes/settings/design_systems.py
 src/api/routes/settings/identities.py
 src/api/routes/settings/slide_styles.py
 src/api/schemas/__init__.py
@@ -218,6 +210,7 @@ src/api/services/feedback_service.py
 src/api/services/job_queue.py
 src/api/services/session_manager.py
 src/api/services/session_naming.py
+src/api/services/slide_repository.py
 src/api/services/usage_events.py
 src/api/services/usage_service.py
 src/api/utils/__init__.py
@@ -240,10 +233,8 @@ src/core/prompt_modules.py
 src/core/settings_db.py
 src/core/user_context.py
 src/database/__init__.py
-src/database/types.py
 src/database/models/__init__.py
 src/database/models/deck_contributor.py
-src/database/models/design_system.py
 src/database/models/encryption_key.py
 src/database/models/feedback.py
 src/database/models/genie_space.py
@@ -268,9 +259,6 @@ src/services/agent.py
 src/services/agent_factory.py
 src/services/config_service.py
 src/services/config_validator.py
-src/services/design_system_compiler.py
-src/services/design_system_service.py
-src/services/design_system_templates.py
 src/services/drive_uploader.py
 src/services/genie_service.py
 src/services/google_slides_auth.py
@@ -302,14 +290,12 @@ src/services/identity_providers/local_provider.py
 src/services/identity_providers/workspace_provider.py
 src/services/tools/__init__.py
 src/services/tools/agent_bricks_tool.py
-src/services/tools/ds_asset_tool.py
 src/services/tools/genie_tool.py
 src/services/tools/mcp_tool.py
 src/services/tools/model_endpoint_tool.py
 src/services/tools/vector_tool.py
 src/utils/__init__.py
 src/utils/css_utils.py
-src/utils/ds_asset_utils.py
 src/utils/error_handling.py
 src/utils/html_safety.py
 src/utils/html_utils.py

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "databricks-tellr-app"
-version = "0.4.2.dev3"
+version = "0.4.2.dev5"
 description = "Tellr application package for Databricks Apps"
 readme = "README.md"
 requires-python = ">=3.10"

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/src/api/main.py

@@ -27,7 +27,6 @@ from src.core.permission_context import (
 from src.api.routes.settings import (
     contributors_router,
     deck_prompts_router,
-    design_systems_router,
     identities_router,
     slide_styles_router,
 )
@@ -485,7 +484,6 @@ app.include_router(contributors_router, prefix="/api/settings", tags=["settings"
 app.include_router(deck_prompts_router, prefix="/api/settings", tags=["settings"])
 app.include_router(identities_router, prefix="/api/settings", tags=["settings"])
 app.include_router(slide_styles_router, prefix="/api/settings", tags=["settings"])
-app.include_router(design_systems_router, prefix="/api/settings", tags=["settings"])
 
 # MCP server — mount the FastMCP streamable-HTTP ASGI app at /mcp.
 # Must be registered before the SPA catch-all (which is added lazily by
@@ -526,27 +524,16 @@ async def get_current_user():
     
     Also includes the user's Databricks ID and group IDs from the permission
     context, which are used for profile permission checks.
-
-    ``is_admin`` is a UX-only signal so the frontend can hide admin surfaces
-    the caller cannot use; it is NOT authorization. Every admin route keeps
-    ``Depends(require_admin)`` and those 403s remain the real protection. It
-    is derived from that same primitive (``is_caller_admin``), so it cannot
-    advertise access the server would refuse, and it fails closed.
     """
-    from src.api.routes._authz import is_caller_admin
     from src.core.permission_context import get_permission_context
-
+    
     ctx_user = get_ctx_user()
     perm_ctx = get_permission_context()
-
-    # Never raises (fails closed to False), so it cannot break identity resolution.
-    is_admin = is_caller_admin()
-
+    
     if ctx_user:
         result = {
             "username": ctx_user,
             "display_name": ctx_user,
-            "is_admin": is_admin,
         }
         # Include permission context info if available
         if perm_ctx:
@@ -564,14 +551,12 @@ async def get_current_user():
             "username": user.user_name,
             "display_name": user.display_name or user.user_name,
             "user_id": user.id,
-            "is_admin": is_admin,
         }
     except Exception as e:
         logger.warning(f"Failed to get current user: {e}")
         return {
             "username": "user",
             "display_name": "User",
-            "is_admin": is_admin,
         }
 
 

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/src/api/mcp_server.py

@@ -28,7 +28,7 @@ from src.api.services.job_queue import enqueue_job, get_job_status
 from src.api.services.session_manager import get_session_manager
 from src.core.database import get_db_session
 from src.core.permission_context import get_permission_context
-from src.core.settings_db import get_default_design_system_id, get_default_slide_style_id
+from src.core.settings_db import get_default_slide_style_id
 from src.domain.slide_deck import SlideDeck
 from src.services.permission_service import get_permission_service
 
@@ -292,106 +292,6 @@ def _request_from_context(ctx: Context) -> Request:
     return req
 
 
-def _template_names_and_ids(design_system_id: int) -> list[tuple[str, int]]:
-    """The ACTIVE design system's ``(template name, template id)`` pairs.
-
-    Eagerly materialized to PLAIN values while the DB session is still OPEN.
-    This replaces a helper that returned the ``DesignSystem`` ORM instance
-    itself: ``get_db_session()`` commits and closes on exit, and the
-    sessionmaker uses SQLAlchemy's default ``expire_on_commit=True``, so that
-    instance was detached with its ``templates`` relationship expired. Reading
-    it raised ``DetachedInstanceError``, which the resolver caught and reported
-    as "name matched nothing" — silently ignoring every valid production
-    ``template_name``. Returning plain values makes that class of bug
-    unavailable rather than merely fixed.
-
-    Returns an empty list when the design system is missing or inactive, so the
-    caller's "no match -> no pin" path is unchanged. Scoped to the ONE design
-    system, so a name can never pin another system's template.
-    """
-    from src.core.database import get_db_session
-    from src.database.models import DesignSystem
-    from src.services.design_system_templates import materialize_templates
-
-    with get_db_session() as db:
-        design_system = (
-            db.query(DesignSystem)
-            .filter_by(id=design_system_id, is_active=True)
-            .first()
-        )
-        if design_system is None:
-            return []
-        # Same idempotent derivation the generation path uses, for systems
-        # imported before the templates table existed.
-        materialize_templates(design_system)
-        db.flush()  # newly materialized rows need ids before we read them
-        return [
-            (str(getattr(template, "name", None) or ""), int(template.id))
-            for template in (getattr(design_system, "templates", None) or [])
-            if getattr(template, "id", None) is not None
-        ]
-
-
-def _normalized_template_name(value: Optional[str]) -> str:
-    """The comparison key for template-name matching: casefolded, with all
-    whitespace runs collapsed to a single space.
-
-    Applied to BOTH sides so the notion of "the same name" is defined in exactly
-    one place — which is also what makes ambiguity detectable rather than
-    order-dependent.
-    """
-    return " ".join((value or "").split()).casefold()
-
-
-def _resolve_template_name(design_system_id: int, template_name: str) -> Optional[int]:
-    """Resolve a template NAME to its id within *design_system_id*.
-
-    MCP callers have no template ids — they see names (the compiler injects
-    the name+description catalog as soft-pick guidance), so a caller that
-    wants a specific layout pins it by name. Matching is case- and
-    whitespace-insensitive.
-
-    Because matching is insensitive, two DISTINCT rows can both match one query
-    ("Two Column" and "two column"). That is AMBIGUOUS, and returning the first
-    hit made the winner depend on relationship load order — a caller could
-    silently get the other layout, and which one could change between requests.
-    An ambiguous name is therefore UNRESOLVED: treated exactly like a name that
-    matches nothing, and logged so the duplicate rows are discoverable.
-
-    Returns ``None`` — never raises — when the design system is missing, the
-    name matches nothing, the name is ambiguous, or the lookup fails. An
-    unresolvable name must degrade to "no pin" (the model then soft-picks as
-    usual), never a 500.
-    """
-    wanted = _normalized_template_name(template_name)
-    if not wanted:
-        return None
-    try:
-        matches = [
-            template_id
-            for name, template_id in _template_names_and_ids(design_system_id)
-            if _normalized_template_name(name) == wanted
-        ]
-        if len(matches) == 1:
-            return matches[0]
-        if matches:
-            logger.warning(
-                "MCP template_name %r is ambiguous in design system %s: it matches "
-                "%d templates (ids %s). Ignoring the pin — the model soft-picks a "
-                "layout instead. Rename the duplicates to make the name unique.",
-                template_name,
-                design_system_id,
-                len(matches),
-                ", ".join(str(template_id) for template_id in sorted(matches)),
-            )
-    except Exception:
-        logger.exception(
-            "Failed to resolve MCP template_name against design system %s",
-            design_system_id,
-        )
-    return None
-
-
 @mcp.tool(
     name="create_deck",
     description=(
@@ -401,10 +301,7 @@ def _resolve_template_name(design_system_id: int, template_name: str) -> Optiona
         "appears in their tellr UI. v1 runs prompt-only: the agent does not "
         "invoke Genie, Vector Search, or other tools. Callers that want data-"
         "backed decks should gather the data themselves and include it in the "
-        "prompt. The deck uses the org-default design system unless "
-        "design_system_id or slide_style_id says otherwise; pass template_name "
-        "to pin one of that design system's named templates (otherwise the "
-        "model picks the best-matching one)."
+        "prompt."
     ),
 )
 async def create_deck(
@@ -412,8 +309,6 @@ async def create_deck(
     prompt: str,
     num_slides: Optional[int] = None,
     slide_style_id: Optional[int] = None,
-    design_system_id: Optional[int] = None,
-    template_name: Optional[str] = None,
     deck_prompt_id: Optional[int] = None,
     correlation_id: Optional[str] = None,
 ) -> dict:
@@ -422,8 +317,6 @@ async def create_deck(
         prompt=prompt,
         num_slides=num_slides,
         slide_style_id=slide_style_id,
-        design_system_id=design_system_id,
-        template_name=template_name,
         deck_prompt_id=deck_prompt_id,
         correlation_id=correlation_id,
     )
@@ -434,8 +327,6 @@ async def _create_deck_impl(
     prompt: str,
     num_slides: Optional[int] = None,
     slide_style_id: Optional[int] = None,
-    design_system_id: Optional[int] = None,
-    template_name: Optional[str] = None,
     deck_prompt_id: Optional[int] = None,
     correlation_id: Optional[str] = None,
 ) -> dict:
@@ -461,48 +352,16 @@ async def _create_deck_impl(
     try:
         with mcp_auth_scope(request) as identity:
             agent_config: dict[str, Any] = {"tools": []}
-            # Resolve the style SOURCE exactly as the browser chat flow does
-            # (see routes/chat.py::_apply_org_default_style_source): a design
-            # system outranks a slide style, an explicit choice always wins,
-            # and only ONE source is ever seeded so the prompt never carries
-            # two competing style authorities. Before this, MCP decks could not
-            # reach a design system at all — only slide_style_id was ever set,
-            # so they always got the default slide style.
-            effective_ds_id = design_system_id
-            if effective_ds_id is None and slide_style_id is None:
-                effective_ds_id = get_default_design_system_id()
-
-            if effective_ds_id is not None:
-                agent_config["design_system_id"] = effective_ds_id
-                # Templates belong to a design system, so a name is only
-                # meaningful here. Unresolvable -> no pin (logged), and the
-                # model soft-picks from the catalog the compiler injects.
-                if template_name and template_name.strip():
-                    template_id = _resolve_template_name(effective_ds_id, template_name)
-                    if template_id is not None:
-                        agent_config["template_id"] = template_id
-                    else:
-                        logger.warning(
-                            "MCP create_deck: template_name %r matched no template "
-                            "on design system %s; generating without a pin",
-                            template_name,
-                            effective_ds_id,
-                        )
-            else:
-                # No design system in play: fall back to the tellr-configured
-                # default slide style rather than the hardcoded
-                # DEFAULT_SLIDE_STYLE constant agent_factory would otherwise use.
-                effective_style_id = slide_style_id
-                if effective_style_id is None:
-                    effective_style_id = get_default_slide_style_id()
-                if effective_style_id is not None:
-                    agent_config["slide_style_id"] = effective_style_id
-                if template_name and template_name.strip():
-                    logger.warning(
-                        "MCP create_deck: template_name %r ignored — templates "
-                        "require a design system and none is selected",
-                        template_name,
-                    )
+            # Mirror the browser chat flow: if the caller didn't specify a
+            # style, fall back to the tellr-configured default
+            # (slide_style_library.is_default=True) rather than the
+            # hardcoded DEFAULT_SLIDE_STYLE constant that agent_factory
+            # uses when agent_config.slide_style_id is absent.
+            effective_style_id = slide_style_id
+            if effective_style_id is None:
+                effective_style_id = get_default_slide_style_id()
+            if effective_style_id is not None:
+                agent_config["slide_style_id"] = effective_style_id
             if deck_prompt_id is not None:
                 agent_config["deck_prompt_id"] = deck_prompt_id
             if num_slides is not None:

{databricks_tellr_app-0.4.2.dev3 → databricks_tellr_app-0.4.2.dev5}/src/api/routes/_authz.py

@@ -372,42 +372,6 @@ def require_admin() -> None:
         raise HTTPException(status_code=403, detail="Admin access required")
 
 
-def is_caller_admin() -> bool:
-    """Return the admin verdict for the current caller as a boolean.
-
-    UX-ONLY signal, for hiding admin surfaces the caller cannot use. This is
-    NOT authorization: every admin route keeps ``Depends(require_admin)`` and
-    those 403s remain the real protection. A caller who forges this flag
-    client-side gains nothing but a page whose every request 403s.
-
-    Deliberately implemented by *delegating to* ``require_admin`` and mapping
-    its 403 to ``False`` rather than re-deriving the verdict. The flag then
-    cannot drift from the gate it advertises, and there is exactly one
-    group-lookup, cache and fail-closed policy in the codebase.
-
-    Consequently the non-production bypass is inherited too: in local dev/test
-    this returns ``True`` for everyone, matching the routes that also allow
-    everyone there, so devloop testing of admin surfaces is not obstructed.
-    In production the verdict is real workspace ``admins`` group membership.
-
-    Never raises: unlike the dependency form, a caller asking "am I admin?"
-    must always get an answer, so any unexpected error degrades to ``False``
-    (fail closed) instead of failing the endpoint that embeds it.
-    """
-    try:
-        require_admin()
-        return True
-    except HTTPException:
-        return False
-    except Exception:
-        logger.warning(
-            "is_caller_admin: admin check raised unexpectedly; reporting "
-            "non-admin",
-            exc_info=True,
-        )
-        return False
-
-
 def reset_admin_cache() -> None:
     """Clear the admin-verdict cache (tests)."""
     _ADMIN_CACHE.clear()

databricks_tellr_app-0.4.2.dev5/src/api/routes/agent_config.py

@@ -0,0 +1,168 @@
+"""REST endpoints for reading and updating a session's agent configuration."""
+
+import asyncio
+import logging
+from typing import Literal
+
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel, Field, ValidationError
+
+from src.api.routes._authz import _check_deck_permission_for_session
+from src.api.schemas.agent_config import AgentConfig, ToolEntry, resolve_agent_config
+from src.api.services.session_manager import SessionNotFoundError, get_session_manager
+from src.core.database import get_db_session
+from src.database.models import UserSession
+from src.database.models.profile_contributor import PermissionLevel
+
+logger = logging.getLogger(__name__)
+
+router = APIRouter(prefix="/api/sessions/{session_id}/agent-config", tags=["agent-config"])
+
+
+# ── helpers ──────────────────────────────────────────────────────────────
+
+
+def _validate_references(config: AgentConfig) -> None:
+    """Validate that slide_style_id and deck_prompt_id reference existing library entries."""
+    from src.database.models import SlideStyleLibrary, SlideDeckPromptLibrary
+
+    with get_db_session() as db:
+        if config.slide_style_id is not None:
+            style = (
+                db.query(SlideStyleLibrary)
+                .filter(
+                    SlideStyleLibrary.id == config.slide_style_id,
+                    SlideStyleLibrary.is_active == True,  # noqa: E712
+                )
+                .first()
+            )
+            if not style:
+                raise HTTPException(
+                    status_code=422,
+                    detail=f"slide_style_id {config.slide_style_id} not found",
+                )
+        if config.deck_prompt_id is not None:
+            prompt = (
+                db.query(SlideDeckPromptLibrary)
+                .filter(
+                    SlideDeckPromptLibrary.id == config.deck_prompt_id,
+                    SlideDeckPromptLibrary.is_active == True,  # noqa: E712
+                )
+                .first()
+            )
+            if not prompt:
+                raise HTTPException(
+                    status_code=422,
+                    detail=f"deck_prompt_id {config.deck_prompt_id} not found",
+                )
+
+
+def _save_agent_config(session_id: str, config: AgentConfig) -> dict:
+    """Persist *config* onto the session row and return its dict representation."""
+    with get_db_session() as db:
+        session = (
+            db.query(UserSession)
+            .filter(UserSession.session_id == session_id)
+            .first()
+        )
+        if not session:
+            raise SessionNotFoundError(f"Session not found: {session_id}")
+        session.agent_config = config.model_dump()
+    return config.model_dump()
+
+
+# ── request schemas ──────────────────────────────────────────────────────
+
+
+class PatchToolRequest(BaseModel):
+    action: Literal["add", "remove"]
+    tool: ToolEntry = Field(...)
+
+
+# ── routes ───────────────────────────────────────────────────────────────
+
+
+@router.get("")
+async def get_agent_config(session_id: str):
+    """Return the current agent config for a session (defaults if null)."""
+    # SDR-4437 HIGH-1: reading a session's agent config requires CAN_VIEW.
+    _check_deck_permission_for_session(session_id, PermissionLevel.CAN_VIEW)
+    try:
+        mgr = get_session_manager()
+        session = await asyncio.to_thread(mgr.get_session, session_id)
+    except SessionNotFoundError:
+        raise HTTPException(status_code=404, detail=f"Session not found: {session_id}")
+
+    raw = session.get("agent_config")
+    config = resolve_agent_config(raw)
+    result = config.model_dump()
+    result["is_configured"] = raw is not None
+    return result
+
+
+@router.put("")
+async def put_agent_config(session_id: str, config: AgentConfig):
+    """Replace the full agent config for a session."""
+    # SDR-4437 HIGH-1: agent-config writes repoint the session's tools — CAN_MANAGE.
+    _check_deck_permission_for_session(session_id, PermissionLevel.CAN_MANAGE)
+    # Pydantic already validated duplicates via model_validator.
+    # Now validate foreign-key references.
+    _validate_references(config)
+
+    try:
+        result = await asyncio.to_thread(_save_agent_config, session_id, config)
+    except SessionNotFoundError:
+        raise HTTPException(status_code=404, detail=f"Session not found: {session_id}")
+
+    return result
+
+
+@router.patch("/tools")
+async def patch_tools(session_id: str, body: PatchToolRequest):
+    """Add or remove a single tool from the session's agent config."""
+    # SDR-4437 HIGH-1: agent-config writes repoint the session's tools — CAN_MANAGE.
+    _check_deck_permission_for_session(session_id, PermissionLevel.CAN_MANAGE)
+    try:
+        mgr = get_session_manager()
+        session = await asyncio.to_thread(mgr.get_session, session_id)
+    except SessionNotFoundError:
+        raise HTTPException(status_code=404, detail=f"Session not found: {session_id}")
+
+    config = resolve_agent_config(session.get("agent_config"))
+
+    if body.action == "add":
+        config.tools.append(body.tool)
+    elif body.action == "remove":
+        # Match by discriminator key (e.g. genie:space_id, mcp:connection_name)
+        from src.api.schemas.agent_config import (
+            GenieTool, MCPTool, VectorIndexTool, ModelEndpointTool, AgentBricksTool,
+        )
+
+        def _key(t):
+            if isinstance(t, GenieTool):
+                return f"genie:{t.space_id}"
+            elif isinstance(t, MCPTool):
+                return f"mcp:{t.connection_name}"
+            elif isinstance(t, VectorIndexTool):
+                return f"vector_index:{t.endpoint_name}:{t.index_name}"
+            elif isinstance(t, ModelEndpointTool):
+                return f"model_endpoint:{t.endpoint_name}"
+            elif isinstance(t, AgentBricksTool):
+                return f"agent_bricks:{t.endpoint_name}"
+            return None
+
+        remove_key = _key(body.tool)
+        config.tools = [t for t in config.tools if _key(t) != remove_key]
+
+    # Re-validate (catches duplicates on add)
+    try:
+        config = AgentConfig.model_validate(config.model_dump())
+    except ValidationError as exc:
+        raise HTTPException(status_code=422, detail=str(exc))
+
+    try:
+        result = await asyncio.to_thread(_save_agent_config, session_id, config)
+    except SessionNotFoundError:
+        raise HTTPException(status_code=404, detail=f"Session not found: {session_id}")
+
+    return result