crudkit 0.6.2__tar.gz → 0.6.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {crudkit-0.6.2 → crudkit-0.6.3}/CHANGELOG.md +12 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/PKG-INFO +1 -1
- {crudkit-0.6.2 → crudkit-0.6.3}/pyproject.toml +1 -1
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/agent.py +24 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/consumers.py +6 -1
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/runner.py +2 -1
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/screen.py +62 -3
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/test_agents.py +4 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/test_hardening.py +34 -2
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/test_sidebar.py +137 -2
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tools.py +104 -0
- crudkit-0.6.2/src/crudkit_frontend/static/crudkit_frontend/assets/index-Q2WMdfSq.js → crudkit-0.6.3/src/crudkit_frontend/static/crudkit_frontend/assets/index-Be6sC4pK.js +184 -184
- crudkit-0.6.3/src/crudkit_frontend/static/crudkit_frontend/assets/index-Cs1_GmjM.css +1 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/templates/crudkit_frontend/index.html +2 -2
- crudkit-0.6.2/src/crudkit_frontend/static/crudkit_frontend/assets/index-aBiOgiJ7.css +0 -1
- {crudkit-0.6.2 → crudkit-0.6.3}/.gitignore +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/README.md +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/manage.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/admin.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/ai_backend.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/apps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/audit.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/authorization.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/checks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/decorators.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/fields.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/llm.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/management/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/management/commands/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/management/commands/add_default_exchange_rates.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/management/commands/backfill_ai_fields.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/management/commands/set_exchange_rate.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0001_squashed.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0002_workspace.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0003_enforce_data_invariants.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0004_changelog_audit.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0005_aicontext.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/0006_changelog_audit_indexes.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/migrations/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/models.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/profile.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/realtime.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/signals.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tasks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/templatetags/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/templatetags/crm_forms.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/templatetags/crm_time.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/templatetags/gravatar.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/templatetags/model_magic.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_ai_backend.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_ai_context.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_ai_fields.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_ai_tasks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_audit.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_authorization.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_backfill_command.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_fields.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_hardening.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_integrity.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_llm.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_money.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_tasks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_view_filters.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/tests/test_workspace.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/utils.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit/widgets.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/authentication.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/consumers.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/filters.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/metadata.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/pagination.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/permissions.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/records.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/routing.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/serializers.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/services.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_authorization.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_email_id_serialization.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_filters.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_list_serialization.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_merge.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_metadata.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_realtime.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_reorder.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_search.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/tests/test_user_profile.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/urls.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/views.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_api/ws_auth.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/admin.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/apps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/background.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/deps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/execution.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/0001_initial.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/0002_assistantconversation.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/0003_proposal_revert.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/0004_proposal_sources.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/0005_agent_agentrun.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/migrations/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/models.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/proposals.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/routing.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/signals.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tasks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/test_approvals.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/tests/test_proposals.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_assistant/utils.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/apps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/context_processors.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/static/crudkit_frontend/assets/favicon-Cit_9t8D.svg +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/tests/templates/crudkit_frontend/index.html +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/tests/test_frontend.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/tests/urls.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/urls.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_frontend/views.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/admin.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/apps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/authentication.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/checks.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/conf.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/migrations/0001_initial.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/migrations/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/models.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/oauth.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/server.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/templates/crudkit_mcp/authorize.html +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/tests/test_hardening.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/tests/test_mcp.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/tests/test_oauth.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/tools.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/urls.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/views.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/src/crudkit_mcp/well_known_urls.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/celery.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/settings.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/adapters.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/ai.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/apps.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/migrations/0001_initial.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/migrations/0002_customer_currency.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/migrations/0003_ticket_watchers.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/migrations/0004_topic_sort_order.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/migrations/__init__.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/testapp/models.py +0 -0
- {crudkit-0.6.2 → crudkit-0.6.3}/tests/urls.py +0 -0
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.6.3 (2026-10-08)
|
|
4
|
+
|
|
5
|
+
- The assistant can work in forms. With a create or edit form open (page or inline-create
|
|
6
|
+
modal), it sees the form and what has been typed so far, and `fill_form` fills in fields
|
|
7
|
+
for the user to review; `open_create_form` opens a new create form pre-filled (e.g. "start
|
|
8
|
+
a reading for Kindred, high priority"). Filled fields are outlined briefly, and nothing is
|
|
9
|
+
saved until the user clicks Save/Create. Chat only: background agents don't get these
|
|
10
|
+
tools. The `[Screen]` block reports `/<TYPE>/create` and `/<CK-ID>/edit` as `create` /
|
|
11
|
+
`edit` routes. (#66)
|
|
12
|
+
- Fix: a chat turn on a model with `CrudKitSettings.assistant_tools` no longer fails with
|
|
13
|
+
`TypeError`; the per-model tools are passed to the agent as a toolset. (#67)
|
|
14
|
+
|
|
3
15
|
## 0.6.2 (2026-10-01)
|
|
4
16
|
|
|
5
17
|
- The assistant and agents can find the records that point at a record (association rows,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: crudkit
|
|
3
|
-
Version: 0.6.
|
|
3
|
+
Version: 0.6.3
|
|
4
4
|
Summary: A metadata-driven CRUD framework for Django: typed object IDs, soft delete, merge, change log, activity feed, saved views, AI fields and a generic REST API.
|
|
5
5
|
Project-URL: Homepage, https://github.com/fenerum/crudkit
|
|
6
6
|
Project-URL: Changelog, https://github.com/fenerum/crudkit/blob/main/backend/CHANGELOG.md
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "crudkit"
|
|
3
|
-
version = "0.6.
|
|
3
|
+
version = "0.6.3"
|
|
4
4
|
description = "A metadata-driven CRUD framework for Django: typed object IDs, soft delete, merge, change log, activity feed, saved views, AI fields and a generic REST API."
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
license = "MIT"
|
|
@@ -10,6 +10,7 @@ from asgiref.sync import sync_to_async
|
|
|
10
10
|
from django.conf import settings
|
|
11
11
|
from pydantic_ai import Agent, RunContext
|
|
12
12
|
from pydantic_ai.settings import ModelSettings
|
|
13
|
+
from pydantic_ai.tools import ToolDefinition
|
|
13
14
|
|
|
14
15
|
from crudkit import llm
|
|
15
16
|
from crudkit_assistant.deps import AssistantDeps
|
|
@@ -17,6 +18,7 @@ from crudkit_assistant.screen import screen_model
|
|
|
17
18
|
from crudkit_assistant.tools import (
|
|
18
19
|
describe_object,
|
|
19
20
|
describe_types,
|
|
21
|
+
fill_form,
|
|
20
22
|
get_changelog,
|
|
21
23
|
get_feed,
|
|
22
24
|
get_object,
|
|
@@ -24,6 +26,7 @@ from crudkit_assistant.tools import (
|
|
|
24
26
|
get_related,
|
|
25
27
|
get_screen_rows,
|
|
26
28
|
list_records,
|
|
29
|
+
open_create_form,
|
|
27
30
|
propose_action,
|
|
28
31
|
propose_bulk_patch,
|
|
29
32
|
propose_create,
|
|
@@ -139,6 +142,18 @@ why customers buy, tone of voice, how we work), propose an edit to the
|
|
|
139
142
|
relevant document with `propose_patch(id="AIC…")`, keeping the rest of its
|
|
140
143
|
text as it is.
|
|
141
144
|
|
|
145
|
+
In this chat you also have two form tools, which fill in a form in the
|
|
146
|
+
user's browser; nothing is saved until the user clicks Save/Create:
|
|
147
|
+
Form tools: fill_form, open_create_form
|
|
148
|
+
When the `[Screen]` block shows an `Open form` and the user asks to fill in,
|
|
149
|
+
complete or change something in it, call `fill_form` instead of a propose
|
|
150
|
+
tool. When the user wants to start a new record they will review first ("draft
|
|
151
|
+
a new ticket for this customer"), call `open_create_form`; use `propose_create`
|
|
152
|
+
only when they want it created without opening the form. Field names and
|
|
153
|
+
choice values come from `describe_types(type)`, foreign keys take the related
|
|
154
|
+
record's id. Never say a form was saved or a record created; say what you
|
|
155
|
+
filled in and that they can review and save it.
|
|
156
|
+
|
|
142
157
|
Style:
|
|
143
158
|
- Be concise. Short paragraphs and bullet lists, not essays.
|
|
144
159
|
- Lead with the observation or recommendation. Cite the specific records,
|
|
@@ -174,6 +189,15 @@ for _tool in (
|
|
|
174
189
|
assistant_agent.tool(_tool)
|
|
175
190
|
|
|
176
191
|
|
|
192
|
+
async def _chat_only(ctx: RunContext[AssistantDeps], tool_def: ToolDefinition) -> ToolDefinition | None:
|
|
193
|
+
"""Form tools act in the user's browser, which background agents don't have."""
|
|
194
|
+
return tool_def if ctx.deps.source != "agent" else None
|
|
195
|
+
|
|
196
|
+
|
|
197
|
+
for _tool in (fill_form, open_create_form):
|
|
198
|
+
assistant_agent.tool(_tool, prepare=_chat_only)
|
|
199
|
+
|
|
200
|
+
|
|
177
201
|
# One `instructions` function, not `system_prompt`s: each instructions source
|
|
178
202
|
# becomes its own system message, and chat templates such as Qwen's reject a
|
|
179
203
|
# system message that isn't first. Instructions also stay out of the stored
|
|
@@ -24,6 +24,10 @@ Outbound message types:
|
|
|
24
24
|
- {"type": "assistant_message", "text": "..."}
|
|
25
25
|
- {"type": "tool_call_pending", id, kind, label, payload, reasoning, target, target_label}
|
|
26
26
|
- {"type": "tool_outcome", id, ok, summary, status}
|
|
27
|
+
- {"type": "form_fill", form: {type_id, mode, record_id}, fields, reasoning}
|
|
28
|
+
— fill the open form in the browser (not saved)
|
|
29
|
+
- {"type": "form_open", type_id, fields, reasoning}
|
|
30
|
+
— open a new create form, pre-filled
|
|
27
31
|
- {"type": "error", "message": "..."}
|
|
28
32
|
"""
|
|
29
33
|
|
|
@@ -166,7 +170,8 @@ class AssistantConsumer(AuthenticatedConsumer):
|
|
|
166
170
|
self.message_history = (self.message_history or []) + (result.new_messages or [])
|
|
167
171
|
for envelope in result.pending_events:
|
|
168
172
|
await self.send_json(envelope)
|
|
169
|
-
|
|
173
|
+
if envelope["type"] == "tool_call_pending":
|
|
174
|
+
transcript.append({"role": "proposal", "id": envelope["id"]})
|
|
170
175
|
if result.output_text:
|
|
171
176
|
await self.send_json({"type": "assistant_message", "text": result.output_text})
|
|
172
177
|
transcript.append({"role": "assistant", "text": result.output_text})
|
|
@@ -35,6 +35,7 @@ from pydantic_ai.messages import (
|
|
|
35
35
|
ThinkingPartDelta,
|
|
36
36
|
ToolReturnPart,
|
|
37
37
|
)
|
|
38
|
+
from pydantic_ai.toolsets import FunctionToolset
|
|
38
39
|
|
|
39
40
|
from crudkit import llm
|
|
40
41
|
from crudkit_assistant.agent import assistant_agent
|
|
@@ -119,7 +120,7 @@ async def run_turn(
|
|
|
119
120
|
deps=deps,
|
|
120
121
|
model=model,
|
|
121
122
|
message_history=message_history or [],
|
|
122
|
-
**({"
|
|
123
|
+
**({"toolsets": [FunctionToolset(extra_tools)]} if extra_tools else {}),
|
|
123
124
|
) as agent_run:
|
|
124
125
|
async for node in agent_run:
|
|
125
126
|
if Agent.is_call_tools_node(node):
|
|
@@ -12,10 +12,24 @@ from crudkit.utils import get_model_types
|
|
|
12
12
|
from crudkit_api import records
|
|
13
13
|
from crudkit_assistant.utils import get_assistant_prompt
|
|
14
14
|
|
|
15
|
-
ROUTES = {"list", "detail", "dashboard", "inbox", "other"}
|
|
15
|
+
ROUTES = {"list", "detail", "create", "edit", "dashboard", "inbox", "other"}
|
|
16
|
+
FORM_MODES = {"create", "edit"}
|
|
16
17
|
MAX_IDS = 100
|
|
17
18
|
MAX_IDS_IN_PROMPT = 30
|
|
18
19
|
MAX_TEXT = 200
|
|
20
|
+
MAX_FORM_VALUES = 100
|
|
21
|
+
MAX_FORM_TEXT = 500
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
@dataclass
|
|
25
|
+
class FormScreen:
|
|
26
|
+
"""The create or edit form open on top of the page (the innermost one
|
|
27
|
+
when modals are nested), with the values typed into it so far."""
|
|
28
|
+
|
|
29
|
+
type_id: str
|
|
30
|
+
mode: str = "create"
|
|
31
|
+
record_id: str = ""
|
|
32
|
+
values: dict = field(default_factory=dict)
|
|
19
33
|
|
|
20
34
|
|
|
21
35
|
@dataclass
|
|
@@ -31,6 +45,7 @@ class Screen:
|
|
|
31
45
|
page: int = 1
|
|
32
46
|
visible_ids: list[str] = field(default_factory=list)
|
|
33
47
|
selected_ids: list[str] = field(default_factory=list)
|
|
48
|
+
form: FormScreen | None = None
|
|
34
49
|
|
|
35
50
|
|
|
36
51
|
def _text(value) -> str:
|
|
@@ -47,6 +62,32 @@ def _ck_ids(values) -> list[str]:
|
|
|
47
62
|
return [value for value in values[:MAX_IDS] if _ck_id(value)]
|
|
48
63
|
|
|
49
64
|
|
|
65
|
+
def _form_value(value):
|
|
66
|
+
if isinstance(value, str):
|
|
67
|
+
return value[:MAX_FORM_TEXT]
|
|
68
|
+
return value if value is None or isinstance(value, bool | int | float) else None
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
def _parse_form(data) -> FormScreen | None:
|
|
72
|
+
if not isinstance(data, dict) or data.get("type_id") not in get_model_types():
|
|
73
|
+
return None
|
|
74
|
+
mode = data.get("mode")
|
|
75
|
+
if mode not in FORM_MODES:
|
|
76
|
+
return None
|
|
77
|
+
record_id = _ck_id(data.get("record_id"))
|
|
78
|
+
if mode == "edit" and not record_id.startswith(data["type_id"]):
|
|
79
|
+
return None
|
|
80
|
+
values = data.get("values")
|
|
81
|
+
return FormScreen(
|
|
82
|
+
type_id=data["type_id"],
|
|
83
|
+
mode=mode,
|
|
84
|
+
record_id=record_id if mode == "edit" else "",
|
|
85
|
+
values={_text(k): _form_value(v) for k, v in list(values.items())[:MAX_FORM_VALUES]}
|
|
86
|
+
if isinstance(values, dict)
|
|
87
|
+
else {},
|
|
88
|
+
)
|
|
89
|
+
|
|
90
|
+
|
|
50
91
|
def parse_screen(data) -> Screen:
|
|
51
92
|
"""Build a Screen from untrusted client JSON, dropping anything malformed."""
|
|
52
93
|
if not isinstance(data, dict):
|
|
@@ -69,6 +110,7 @@ def parse_screen(data) -> Screen:
|
|
|
69
110
|
page=page,
|
|
70
111
|
visible_ids=_ck_ids(data.get("visible_ids")),
|
|
71
112
|
selected_ids=_ck_ids(data.get("selected_ids")),
|
|
113
|
+
form=_parse_form(data.get("form")),
|
|
72
114
|
)
|
|
73
115
|
|
|
74
116
|
|
|
@@ -80,8 +122,12 @@ def load_screen_record(user, screen: Screen, action: str = "view"):
|
|
|
80
122
|
|
|
81
123
|
|
|
82
124
|
def screen_model(screen: Screen):
|
|
83
|
-
"""The model the screen is about: the open
|
|
84
|
-
|
|
125
|
+
"""The model the screen is about: the open form's, else the open record's,
|
|
126
|
+
else the list's."""
|
|
127
|
+
if screen.form is not None:
|
|
128
|
+
type_id = screen.form.type_id
|
|
129
|
+
else:
|
|
130
|
+
type_id = screen.record_id[:3] if screen.record_id else screen.type_id
|
|
85
131
|
return get_model_types().get(type_id)
|
|
86
132
|
|
|
87
133
|
|
|
@@ -90,6 +136,17 @@ def _id_list(ids: list[str]) -> str:
|
|
|
90
136
|
return shown + (f" … (+{len(ids) - MAX_IDS_IN_PROMPT} more)" if len(ids) > MAX_IDS_IN_PROMPT else "")
|
|
91
137
|
|
|
92
138
|
|
|
139
|
+
def _describe_form(user, form: FormScreen) -> str:
|
|
140
|
+
model = get_model_types()[form.type_id]
|
|
141
|
+
if form.mode == "edit":
|
|
142
|
+
record = get_authorized_instance(user, form.type_id, parse_ck_id(form.record_id)[1], "change")
|
|
143
|
+
what = f"editing {model._meta.verbose_name} {form.record_id}" + (f" ({record})" if record else "")
|
|
144
|
+
else:
|
|
145
|
+
what = f"new {model._meta.verbose_name} ({form.type_id})"
|
|
146
|
+
filled = {name: value for name, value in form.values.items() if value not in (None, "")}
|
|
147
|
+
return f"Open form: {what}, not saved yet. Current values: {filled or 'none'}."
|
|
148
|
+
|
|
149
|
+
|
|
93
150
|
def describe_screen(user, screen: Screen) -> str:
|
|
94
151
|
"""The `[Screen]` block prepended to each user turn."""
|
|
95
152
|
lines = []
|
|
@@ -114,6 +171,8 @@ def describe_screen(user, screen: Screen) -> str:
|
|
|
114
171
|
lines.append(", ".join(parts) + ".")
|
|
115
172
|
else:
|
|
116
173
|
lines.append(f"Page: {screen.route} ({screen.path or '/'}).")
|
|
174
|
+
if screen.form is not None:
|
|
175
|
+
lines.append(_describe_form(user, screen.form))
|
|
117
176
|
if screen.visible_ids:
|
|
118
177
|
lines.append(f"Visible rows ({len(screen.visible_ids)}): {_id_list(screen.visible_ids)}.")
|
|
119
178
|
if screen.selected_ids:
|
|
@@ -83,6 +83,10 @@ class AgentTestCase(TestCase):
|
|
|
83
83
|
parts = info.model_request_parameters.instruction_parts
|
|
84
84
|
self.assertEqual(len(parts), 1)
|
|
85
85
|
self.instructions.append(parts[0].content)
|
|
86
|
+
# Form tools act in a browser, which agents don't have.
|
|
87
|
+
tool_names = {tool.name for tool in info.function_tools}
|
|
88
|
+
self.assertNotIn("fill_form", tool_names)
|
|
89
|
+
self.assertNotIn("Form tools", parts[0].content)
|
|
86
90
|
last = messages[-1].parts[-1]
|
|
87
91
|
if isinstance(last, UserPromptPart):
|
|
88
92
|
self.prompts.append(last.content)
|
|
@@ -5,6 +5,7 @@ proposal tools refuse what the serializer would silently mangle.
|
|
|
5
5
|
"""
|
|
6
6
|
|
|
7
7
|
import asyncio
|
|
8
|
+
from contextlib import asynccontextmanager
|
|
8
9
|
from datetime import timedelta
|
|
9
10
|
from unittest.mock import patch
|
|
10
11
|
|
|
@@ -15,7 +16,9 @@ from django.db.models.signals import post_save
|
|
|
15
16
|
from django.test import TestCase, override_settings, skipUnlessDBFeature
|
|
16
17
|
from django.test.utils import CaptureQueriesContext
|
|
17
18
|
from django.utils import timezone
|
|
18
|
-
from pydantic_ai
|
|
19
|
+
from pydantic_ai import RunContext, Tool
|
|
20
|
+
from pydantic_ai.messages import ModelResponse, TextPart, ToolCallPart, UserPromptPart
|
|
21
|
+
from pydantic_ai.models.function import FunctionModel
|
|
19
22
|
from rest_framework.test import APIClient
|
|
20
23
|
|
|
21
24
|
from crudkit.audit import audit
|
|
@@ -26,7 +29,7 @@ from crudkit_assistant import background, tools
|
|
|
26
29
|
from crudkit_assistant.deps import AssistantDeps
|
|
27
30
|
from crudkit_assistant.models import Agent, AgentRun, AssistantProposal
|
|
28
31
|
from crudkit_assistant.proposals import create_proposal
|
|
29
|
-
from crudkit_assistant.runner import _load_extra_tools
|
|
32
|
+
from crudkit_assistant.runner import _load_extra_tools, run_turn
|
|
30
33
|
from crudkit_assistant.screen import Screen
|
|
31
34
|
from crudkit_assistant.tests.test_agents import AgentTestCase, User, _FakeCtx, grant
|
|
32
35
|
from tests.testapp.models import Customer, Ticket, Topic
|
|
@@ -356,6 +359,35 @@ class AgentHardeningTests(AgentTestCase):
|
|
|
356
359
|
self.assertNotIn('propose_patch(id="AIC', self.instructions[0])
|
|
357
360
|
|
|
358
361
|
|
|
362
|
+
class ProjectToolTests(TestCase):
|
|
363
|
+
def test_project_tools_run_in_the_chat(self):
|
|
364
|
+
user = User.objects.create_user("user")
|
|
365
|
+
grant(user, Customer, "view")
|
|
366
|
+
customer = Customer.objects.create(name="Acme", created_by=user, updated_by=user)
|
|
367
|
+
ran = []
|
|
368
|
+
|
|
369
|
+
def ping(ctx: RunContext[AssistantDeps]) -> str:
|
|
370
|
+
ran.append(ctx.deps.screen.record_id)
|
|
371
|
+
return "pong"
|
|
372
|
+
|
|
373
|
+
def model_fn(messages, info):
|
|
374
|
+
if isinstance(messages[-1].parts[-1], UserPromptPart):
|
|
375
|
+
return ModelResponse(parts=[ToolCallPart(tool_name="ping", args={})])
|
|
376
|
+
return ModelResponse(parts=[TextPart("Pinged.")])
|
|
377
|
+
|
|
378
|
+
@asynccontextmanager
|
|
379
|
+
async def fake_factory():
|
|
380
|
+
yield FunctionModel(model_fn)
|
|
381
|
+
|
|
382
|
+
deps = AssistantDeps(user_id=user.pk, session_key="s", screen=Screen(record_id=customer.id))
|
|
383
|
+
with (
|
|
384
|
+
patch("tests.testapp.ai.create_model", fake_factory),
|
|
385
|
+
patch.object(Customer.CrudKitSettings, "assistant_tools", [Tool(ping)], create=True),
|
|
386
|
+
):
|
|
387
|
+
async_to_sync(run_turn)("Ping it", deps)
|
|
388
|
+
self.assertEqual(ran, [customer.id])
|
|
389
|
+
|
|
390
|
+
|
|
359
391
|
class ProposalToolTests(TestCase):
|
|
360
392
|
def setUp(self):
|
|
361
393
|
self.user = User.objects.create_user("user")
|
|
@@ -22,8 +22,8 @@ from crudkit_assistant import tools
|
|
|
22
22
|
from crudkit_assistant.deps import AssistantDeps
|
|
23
23
|
from crudkit_assistant.models import AssistantConversation, AssistantProposal
|
|
24
24
|
from crudkit_assistant.routing import websocket_urlpatterns
|
|
25
|
-
from crudkit_assistant.screen import MAX_IDS, Screen, describe_screen, parse_screen
|
|
26
|
-
from tests.testapp.models import Comment, Customer, Ticket
|
|
25
|
+
from crudkit_assistant.screen import MAX_IDS, FormScreen, Screen, describe_screen, parse_screen, screen_model
|
|
26
|
+
from tests.testapp.models import Comment, Customer, Ticket, Topic
|
|
27
27
|
|
|
28
28
|
User = get_user_model()
|
|
29
29
|
|
|
@@ -101,6 +101,30 @@ class ParseScreenTests(TestCase):
|
|
|
101
101
|
screen = parse_screen({"visible_ids": [f"CUS{i}" for i in range(MAX_IDS + 50)]})
|
|
102
102
|
self.assertEqual(len(screen.visible_ids), MAX_IDS)
|
|
103
103
|
|
|
104
|
+
def test_open_form(self):
|
|
105
|
+
screen = parse_screen(
|
|
106
|
+
{
|
|
107
|
+
"route": "detail",
|
|
108
|
+
"record_id": "CUS1",
|
|
109
|
+
"form": {"type_id": "TIC", "mode": "create", "record_id": "CUS1", "values": {"subject": "x" * 900}},
|
|
110
|
+
}
|
|
111
|
+
)
|
|
112
|
+
self.assertEqual(screen.form, FormScreen(type_id="TIC", mode="create", values={"subject": "x" * 500}))
|
|
113
|
+
# The form, here a modal over a customer, is what the screen is about.
|
|
114
|
+
self.assertEqual(screen_model(screen), Ticket)
|
|
115
|
+
edit = parse_screen({"form": {"type_id": "CUS", "mode": "edit", "record_id": "CUS2", "values": {"a": [1]}}})
|
|
116
|
+
self.assertEqual(edit.form, FormScreen(type_id="CUS", mode="edit", record_id="CUS2", values={"a": None}))
|
|
117
|
+
|
|
118
|
+
def test_drops_malformed_forms(self):
|
|
119
|
+
for form in (
|
|
120
|
+
"garbage",
|
|
121
|
+
{"type_id": "XXX", "mode": "create"},
|
|
122
|
+
{"type_id": "CUS", "mode": "delete"},
|
|
123
|
+
{"type_id": "CUS", "mode": "edit"},
|
|
124
|
+
{"type_id": "CUS", "mode": "edit", "record_id": "TIC1"},
|
|
125
|
+
):
|
|
126
|
+
self.assertIsNone(parse_screen({"form": form}).form, form)
|
|
127
|
+
|
|
104
128
|
|
|
105
129
|
class DescribeScreenTests(TestCase):
|
|
106
130
|
def setUp(self):
|
|
@@ -128,6 +152,15 @@ class DescribeScreenTests(TestCase):
|
|
|
128
152
|
block = describe_screen(self.user, Screen(route="detail", record_id=self.customer.pk))
|
|
129
153
|
self.assertNotIn("Acme", block)
|
|
130
154
|
|
|
155
|
+
def test_open_forms(self):
|
|
156
|
+
create = FormScreen(type_id="CUS", values={"name": "Beta", "email": "", "status": "active"})
|
|
157
|
+
block = describe_screen(self.user, Screen(route="create", type_id="CUS", form=create))
|
|
158
|
+
self.assertIn("Open form: new customer (CUS), not saved yet. Current values: {'name': 'Beta', 'status': 'active'}.", block)
|
|
159
|
+
grant(self.user, "change_customer")
|
|
160
|
+
edit = FormScreen(type_id="CUS", mode="edit", record_id=self.customer.pk)
|
|
161
|
+
block = describe_screen(self.user, Screen(route="edit", record_id=self.customer.pk, form=edit))
|
|
162
|
+
self.assertIn(f"Open form: editing customer {self.customer.pk} (Acme), not saved yet. Current values: none.", block)
|
|
163
|
+
|
|
131
164
|
|
|
132
165
|
class CrossRecordToolTests(TestCase):
|
|
133
166
|
def setUp(self):
|
|
@@ -272,6 +305,82 @@ class BulkPatchTests(TestCase):
|
|
|
272
305
|
self.assertEqual(tools.describe_call("propose_bulk_patch", {"ids": self.ids}), "Drafting changes to 3 records")
|
|
273
306
|
|
|
274
307
|
|
|
308
|
+
class FormToolTests(TestCase):
|
|
309
|
+
def setUp(self):
|
|
310
|
+
self.user = User.objects.create_user(username="staff", password="x")
|
|
311
|
+
grant(self.user, "view_customer", "add_customer", "change_customer", "view_topic")
|
|
312
|
+
self.customer = make_customer(self.user, "Acme")
|
|
313
|
+
self.topic = Topic.objects.create(name="Billing", created_by=self.user, updated_by=self.user)
|
|
314
|
+
self.deps = AssistantDeps(
|
|
315
|
+
user_id=self.user.pk,
|
|
316
|
+
session_key="s1",
|
|
317
|
+
screen=Screen(route="create", type_id="CUS", form=FormScreen(type_id="CUS")),
|
|
318
|
+
)
|
|
319
|
+
self.deps._outbox = asyncio.Queue() # type: ignore[attr-defined]
|
|
320
|
+
|
|
321
|
+
def run_tool(self, tool, *args, **kwargs):
|
|
322
|
+
return async_to_sync(tool)(_FakeCtx(self.deps), *args, **kwargs)
|
|
323
|
+
|
|
324
|
+
def events(self):
|
|
325
|
+
out = []
|
|
326
|
+
while not self.deps._outbox.empty(): # type: ignore[attr-defined]
|
|
327
|
+
out.append(self.deps._outbox.get_nowait()) # type: ignore[attr-defined]
|
|
328
|
+
return out
|
|
329
|
+
|
|
330
|
+
def test_fill_form_sends_values_for_the_open_form(self):
|
|
331
|
+
result = self.run_tool(tools.fill_form, {"name": "Beta", "status": "churned", "topic": self.topic.pk})
|
|
332
|
+
self.assertIn("Filled name, status, topic in the customer form", result)
|
|
333
|
+
self.assertIn("clicks Create", result)
|
|
334
|
+
self.assertEqual(
|
|
335
|
+
self.events(),
|
|
336
|
+
[
|
|
337
|
+
{
|
|
338
|
+
"type": "form_fill",
|
|
339
|
+
"form": {"type_id": "CUS", "mode": "create", "record_id": ""},
|
|
340
|
+
"fields": {"name": "Beta", "status": "churned", "topic": {"id": self.topic.pk, "label": "Billing"}},
|
|
341
|
+
"reasoning": "",
|
|
342
|
+
}
|
|
343
|
+
],
|
|
344
|
+
)
|
|
345
|
+
self.assertEqual(Customer.objects.count(), 1)
|
|
346
|
+
self.assertFalse(AssistantProposal.objects.exists())
|
|
347
|
+
|
|
348
|
+
def test_fill_form_rejects_bad_values(self):
|
|
349
|
+
for fields in ({"nope": 1}, {"status": "gone"}, {"topic": "TOP999"}, {"created_by": self.user.pk}, {}):
|
|
350
|
+
self.assertTrue(self.run_tool(tools.fill_form, fields).startswith("ERROR"), fields)
|
|
351
|
+
self.assertEqual(self.events(), [])
|
|
352
|
+
|
|
353
|
+
def test_fill_form_needs_an_open_form(self):
|
|
354
|
+
self.deps.screen = Screen(route="list", type_id="CUS")
|
|
355
|
+
self.assertTrue(self.run_tool(tools.fill_form, {"name": "Beta"}).startswith("ERROR: No form is open"))
|
|
356
|
+
|
|
357
|
+
def test_fill_form_checks_permissions(self):
|
|
358
|
+
self.deps.screen.form = FormScreen(type_id="CUS", mode="edit", record_id=self.customer.pk)
|
|
359
|
+
self.assertIn("clicks Save", self.run_tool(tools.fill_form, {"name": "Acme Inc"}))
|
|
360
|
+
with hide(self.customer):
|
|
361
|
+
self.assertTrue(self.run_tool(tools.fill_form, {"name": "Acme Inc"}).startswith("ERROR"))
|
|
362
|
+
self.user.user_permissions.remove(*Permission.objects.filter(codename__in=["add_customer", "change_customer"]))
|
|
363
|
+
self.assertTrue(self.run_tool(tools.fill_form, {"name": "Acme Inc"}).startswith("ERROR"))
|
|
364
|
+
self.deps.screen.form = FormScreen(type_id="CUS")
|
|
365
|
+
self.assertEqual(self.run_tool(tools.fill_form, {"name": "Beta"}), "ERROR: you may not create CUS records.")
|
|
366
|
+
self.assertEqual(len(self.events()), 1)
|
|
367
|
+
|
|
368
|
+
def test_open_create_form(self):
|
|
369
|
+
self.deps.screen = Screen(route="detail", record_id=self.customer.pk)
|
|
370
|
+
result = self.run_tool(tools.open_create_form, "CUS", {"name": "Beta"})
|
|
371
|
+
self.assertIn("clicks Create", result)
|
|
372
|
+
self.assertEqual(self.events(), [{"type": "form_open", "type_id": "CUS", "fields": {"name": "Beta"}, "reasoning": ""}])
|
|
373
|
+
self.assertIn("Opened a new customer form", self.run_tool(tools.open_create_form, "CUS"))
|
|
374
|
+
for args in (("NOPE",), ("CUS", {"status": "gone"}), ("CUS", "name=Beta")):
|
|
375
|
+
self.assertTrue(self.run_tool(tools.open_create_form, *args).startswith("ERROR"), args)
|
|
376
|
+
self.user.user_permissions.remove(Permission.objects.get(codename="add_customer"))
|
|
377
|
+
self.assertTrue(self.run_tool(tools.open_create_form, "CUS").startswith("ERROR: you may not"))
|
|
378
|
+
|
|
379
|
+
def test_labels(self):
|
|
380
|
+
self.assertEqual(tools.describe_call("fill_form", {}), "Filling in the form")
|
|
381
|
+
self.assertEqual(tools.describe_call("open_create_form", {"type": "TIC"}), "Opening a new TIC form")
|
|
382
|
+
|
|
383
|
+
|
|
275
384
|
class ConversationSocketTests(TransactionTestCase):
|
|
276
385
|
"""open_conversation → screen → user_message → proposal → confirm → reopen."""
|
|
277
386
|
|
|
@@ -313,6 +422,8 @@ class ConversationSocketTests(TransactionTestCase):
|
|
|
313
422
|
for c in (self.customer, self.other)
|
|
314
423
|
]
|
|
315
424
|
)
|
|
425
|
+
if "fill it in" in last.content:
|
|
426
|
+
return ModelResponse(parts=[ToolCallPart("fill_form", {"fields": {"name": "Gamma"}})])
|
|
316
427
|
if "rename" in last.content:
|
|
317
428
|
return ModelResponse(
|
|
318
429
|
parts=[ToolCallPart("propose_patch", {"fields": {"name": "Acme Inc"}, "id": self.customer.pk})]
|
|
@@ -474,6 +585,30 @@ class ConversationSocketTests(TransactionTestCase):
|
|
|
474
585
|
self.assertEqual([(o["type"], o["ok"]) for o in outcomes], [("tool_outcome", True)] * 2)
|
|
475
586
|
self.assertEqual({c.status async for c in Customer.objects.all()}, {"churned"})
|
|
476
587
|
|
|
588
|
+
async def test_fill_form_streams_to_the_browser(self):
|
|
589
|
+
with patch("tests.testapp.ai.create_model", self.fake_factory):
|
|
590
|
+
ws = await self.connect()
|
|
591
|
+
await ws.send_json_to({"type": "open_conversation", "id": None})
|
|
592
|
+
opened = await ws.receive_json_from()
|
|
593
|
+
form = {"type_id": "CUS", "mode": "edit", "record_id": self.customer.pk, "values": {"name": "Acme"}}
|
|
594
|
+
await ws.send_json_to({"type": "screen", "screen": {"route": "edit", "form": form}})
|
|
595
|
+
await ws.send_json_to({"type": "user_message", "text": "fill it in"})
|
|
596
|
+
events = await self.receive_turn(ws)
|
|
597
|
+
await ws.disconnect()
|
|
598
|
+
|
|
599
|
+
self.assertIn("Open form: editing customer", self.prompts[0])
|
|
600
|
+
self.assertIn("fill_form, open_create_form", self.instructions[0])
|
|
601
|
+
self.assertEqual(
|
|
602
|
+
[event["type"] for event in events if not event["type"].endswith("_delta")],
|
|
603
|
+
["turn_start", "tool_start", "tool_end", "form_fill", "assistant_message", "turn_end"],
|
|
604
|
+
)
|
|
605
|
+
fill = next(event for event in events if event["type"] == "form_fill")
|
|
606
|
+
self.assertEqual(fill["fields"], {"name": "Gamma"})
|
|
607
|
+
await self.customer.arefresh_from_db()
|
|
608
|
+
self.assertEqual(self.customer.name, "Acme")
|
|
609
|
+
conversation = await AssistantConversation.objects.aget(pk=opened["id"])
|
|
610
|
+
self.assertEqual([item["role"] for item in conversation.transcript], ["user", "activity", "assistant"])
|
|
611
|
+
|
|
477
612
|
async def test_new_conversation_waits_for_the_running_turn(self):
|
|
478
613
|
self.release = asyncio.Event()
|
|
479
614
|
with patch("tests.testapp.ai.create_model", self.fake_factory):
|
|
@@ -7,6 +7,9 @@ Split into two physically-separate groups:
|
|
|
7
7
|
(CK-ID) and default to the record open on the user's screen; the
|
|
8
8
|
cross-record tools (search, list_records, …) share their logic with MCP
|
|
9
9
|
via crudkit_api.records.
|
|
10
|
+
- Form tools: do NOT mutate either. They emit a form_fill / form_open WS
|
|
11
|
+
event that the sidebar applies to the form in the user's browser; the
|
|
12
|
+
user still saves it.
|
|
10
13
|
- Proposal tools: do NOT mutate. They persist an AssistantProposal row,
|
|
11
14
|
emit a tool_call_pending WS event, and return a "pending" string. The
|
|
12
15
|
actual mutation only runs in AssistantConsumer.confirm_proposal() when
|
|
@@ -63,6 +66,8 @@ def describe_call(tool_name: str, args: dict) -> str:
|
|
|
63
66
|
"propose_create_note": f"Drafting a note on {target}",
|
|
64
67
|
"propose_create": f"Drafting a new {args.get('type') or 'record'}",
|
|
65
68
|
"propose_revert": "Drafting an undo",
|
|
69
|
+
"fill_form": "Filling in the form",
|
|
70
|
+
"open_create_form": f"Opening a new {args.get('type') or 'record'} form",
|
|
66
71
|
}
|
|
67
72
|
return labels.get(tool_name, f"Running {tool_name}")
|
|
68
73
|
|
|
@@ -589,3 +594,102 @@ async def propose_revert(ctx: RunContext[AssistantDeps], change_set: str, reason
|
|
|
589
594
|
return f"ERROR: {error}"
|
|
590
595
|
label = f"Undo change {str(change_set)[:8]}"
|
|
591
596
|
return await _propose(ctx, target, AssistantProposal.Kind.REVERT, label, {"change_set": str(change_set)}, reasoning)
|
|
597
|
+
|
|
598
|
+
|
|
599
|
+
# ---------------------------------------------------------------------------
|
|
600
|
+
# Form tools (chat only — fill the form in the user's browser; nothing is saved)
|
|
601
|
+
|
|
602
|
+
|
|
603
|
+
def _form_values(model, fields: dict) -> dict:
|
|
604
|
+
"""`fields` as the form holds them: foreign keys as {id, label}."""
|
|
605
|
+
values = {}
|
|
606
|
+
for name, value in fields.items():
|
|
607
|
+
field = model._meta.get_field(name)
|
|
608
|
+
if isinstance(value, dict) and field.is_relation:
|
|
609
|
+
value = value.get("id")
|
|
610
|
+
if field.is_relation and value not in (None, ""):
|
|
611
|
+
related = field.related_model._default_manager.get(pk=value)
|
|
612
|
+
value = {"id": str(related.pk), "label": str(related)}
|
|
613
|
+
values[name] = value
|
|
614
|
+
return values
|
|
615
|
+
|
|
616
|
+
|
|
617
|
+
def _checked_form_fields(user, model, fields: dict) -> dict:
|
|
618
|
+
if error := _field_errors(model, fields, user):
|
|
619
|
+
raise ValueError(error)
|
|
620
|
+
return _form_values(model, fields)
|
|
621
|
+
|
|
622
|
+
|
|
623
|
+
def _sent_text(model, fields: dict, mode: str) -> str:
|
|
624
|
+
button = "Save" if mode == "edit" else "Create"
|
|
625
|
+
return (
|
|
626
|
+
f"Filled {', '.join(fields)} in the {model._meta.verbose_name} form on the user's screen. "
|
|
627
|
+
f"Nothing is saved: the user reviews the form and clicks {button}."
|
|
628
|
+
)
|
|
629
|
+
|
|
630
|
+
|
|
631
|
+
async def fill_form(ctx: RunContext[AssistantDeps], fields: dict[str, Any], reasoning: str = "") -> str:
|
|
632
|
+
"""Fill in fields of the create or edit form open on the user's screen
|
|
633
|
+
(see `Open form` in the [Screen] block). `fields` is a {field_name: value}
|
|
634
|
+
dict whose names and choice values come from describe_types(type); foreign
|
|
635
|
+
keys take the related record's id. Nothing is saved: the user reviews the
|
|
636
|
+
form and saves it."""
|
|
637
|
+
form = ctx.deps.screen.form
|
|
638
|
+
if form is None:
|
|
639
|
+
return "ERROR: No form is open. Use open_create_form to start a new record."
|
|
640
|
+
if not isinstance(fields, dict) or not fields:
|
|
641
|
+
return "ERROR: `fields` must be a non-empty {field_name: value} dict."
|
|
642
|
+
|
|
643
|
+
def _run():
|
|
644
|
+
user = _load_user(ctx.deps)
|
|
645
|
+
model = records.resolve_type(user, form.type_id)
|
|
646
|
+
if form.mode == "edit":
|
|
647
|
+
instance, error = _load_changeable(ctx.deps, form.record_id)
|
|
648
|
+
if instance is None:
|
|
649
|
+
raise ValueError(error)
|
|
650
|
+
elif not has_model_permission(user, model, "add"):
|
|
651
|
+
raise PermissionDenied
|
|
652
|
+
return model, _checked_form_fields(user, model, fields)
|
|
653
|
+
|
|
654
|
+
try:
|
|
655
|
+
model, values = await sync_to_async(_run)()
|
|
656
|
+
except PermissionDenied:
|
|
657
|
+
return f"ERROR: you may not create {form.type_id} records."
|
|
658
|
+
except ValueError as exc:
|
|
659
|
+
return f"ERROR: {exc}"
|
|
660
|
+
target = {"type_id": form.type_id, "mode": form.mode, "record_id": form.record_id}
|
|
661
|
+
await _emit(ctx, {"type": "form_fill", "form": target, "fields": values, "reasoning": reasoning})
|
|
662
|
+
return _sent_text(model, values, form.mode)
|
|
663
|
+
|
|
664
|
+
|
|
665
|
+
async def open_create_form(
|
|
666
|
+
ctx: RunContext[AssistantDeps],
|
|
667
|
+
type: str,
|
|
668
|
+
fields: dict[str, Any] | None = None,
|
|
669
|
+
reasoning: str = "",
|
|
670
|
+
) -> str:
|
|
671
|
+
"""Open a new create form for `type` (a TYPE_ID) on the user's screen,
|
|
672
|
+
pre-filled with `fields` ({field_name: value}, names and choice values from
|
|
673
|
+
describe_types(type)). Nothing is created: the user reviews the form and
|
|
674
|
+
clicks Create."""
|
|
675
|
+
fields = fields or {}
|
|
676
|
+
if not isinstance(fields, dict):
|
|
677
|
+
return "ERROR: `fields` must be a {field_name: value} dict."
|
|
678
|
+
|
|
679
|
+
def _run():
|
|
680
|
+
user = _load_user(ctx.deps)
|
|
681
|
+
model = records.resolve_type(user, type)
|
|
682
|
+
if not has_model_permission(user, model, "add"):
|
|
683
|
+
raise PermissionDenied
|
|
684
|
+
return model, _checked_form_fields(user, model, fields)
|
|
685
|
+
|
|
686
|
+
try:
|
|
687
|
+
model, values = await sync_to_async(_run)()
|
|
688
|
+
except PermissionDenied:
|
|
689
|
+
return f"ERROR: you may not create {type} records."
|
|
690
|
+
except ValueError as exc:
|
|
691
|
+
return f"ERROR: {exc}"
|
|
692
|
+
await _emit(ctx, {"type": "form_open", "type_id": model.TYPE_ID, "fields": values, "reasoning": reasoning})
|
|
693
|
+
if not values:
|
|
694
|
+
return f"Opened a new {model._meta.verbose_name} form. Nothing is created until the user clicks Create."
|
|
695
|
+
return _sent_text(model, values, "create")
|