flock-core 0.5.0b28__py3-none-any.whl → 0.5.56b0__py3-none-any.whl
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.
Potentially problematic release.
This version of flock-core might be problematic. Click here for more details.
- flock/__init__.py +12 -217
- flock/agent.py +678 -0
- flock/api/themes.py +71 -0
- flock/artifacts.py +79 -0
- flock/cli.py +75 -0
- flock/components.py +173 -0
- flock/dashboard/__init__.py +28 -0
- flock/dashboard/collector.py +283 -0
- flock/dashboard/events.py +182 -0
- flock/dashboard/launcher.py +230 -0
- flock/dashboard/service.py +537 -0
- flock/dashboard/websocket.py +235 -0
- flock/engines/__init__.py +6 -0
- flock/engines/dspy_engine.py +856 -0
- flock/examples.py +128 -0
- flock/{core/util → helper}/cli_helper.py +4 -3
- flock/{core/logging → logging}/__init__.py +2 -3
- flock/{core/logging → logging}/formatters/enum_builder.py +3 -4
- flock/{core/logging → logging}/formatters/theme_builder.py +19 -44
- flock/{core/logging → logging}/formatters/themed_formatter.py +69 -115
- flock/{core/logging → logging}/logging.py +77 -61
- flock/{core/logging → logging}/telemetry.py +20 -26
- flock/{core/logging → logging}/telemetry_exporter/base_exporter.py +2 -2
- flock/{core/logging → logging}/telemetry_exporter/file_exporter.py +6 -9
- flock/{core/logging → logging}/telemetry_exporter/sqlite_exporter.py +2 -3
- flock/{core/logging → logging}/trace_and_logged.py +20 -24
- flock/mcp/__init__.py +91 -0
- flock/{core/mcp/mcp_client.py → mcp/client.py} +103 -154
- flock/{core/mcp/mcp_config.py → mcp/config.py} +62 -117
- flock/mcp/manager.py +255 -0
- flock/mcp/servers/sse/__init__.py +1 -1
- flock/mcp/servers/sse/flock_sse_server.py +11 -53
- flock/mcp/servers/stdio/__init__.py +1 -1
- flock/mcp/servers/stdio/flock_stdio_server.py +8 -48
- flock/mcp/servers/streamable_http/flock_streamable_http_server.py +17 -62
- flock/mcp/servers/websockets/flock_websocket_server.py +7 -40
- flock/{core/mcp/flock_mcp_tool.py → mcp/tool.py} +16 -26
- flock/mcp/types/__init__.py +42 -0
- flock/{core/mcp → mcp}/types/callbacks.py +9 -15
- flock/{core/mcp → mcp}/types/factories.py +7 -6
- flock/{core/mcp → mcp}/types/handlers.py +13 -18
- flock/{core/mcp → mcp}/types/types.py +70 -74
- flock/{core/mcp → mcp}/util/helpers.py +1 -1
- flock/orchestrator.py +645 -0
- flock/registry.py +148 -0
- flock/runtime.py +262 -0
- flock/service.py +140 -0
- flock/store.py +69 -0
- flock/subscription.py +111 -0
- flock/themes/andromeda.toml +1 -1
- flock/themes/apple-system-colors.toml +1 -1
- flock/themes/arcoiris.toml +1 -1
- flock/themes/atomonelight.toml +1 -1
- flock/themes/ayu copy.toml +1 -1
- flock/themes/ayu-light.toml +1 -1
- flock/themes/belafonte-day.toml +1 -1
- flock/themes/belafonte-night.toml +1 -1
- flock/themes/blulocodark.toml +1 -1
- flock/themes/breeze.toml +1 -1
- flock/themes/broadcast.toml +1 -1
- flock/themes/brogrammer.toml +1 -1
- flock/themes/builtin-dark.toml +1 -1
- flock/themes/builtin-pastel-dark.toml +1 -1
- flock/themes/catppuccin-latte.toml +1 -1
- flock/themes/catppuccin-macchiato.toml +1 -1
- flock/themes/catppuccin-mocha.toml +1 -1
- flock/themes/cga.toml +1 -1
- flock/themes/chalk.toml +1 -1
- flock/themes/ciapre.toml +1 -1
- flock/themes/coffee-theme.toml +1 -1
- flock/themes/cyberpunkscarletprotocol.toml +1 -1
- flock/themes/dark+.toml +1 -1
- flock/themes/darkermatrix.toml +1 -1
- flock/themes/darkside.toml +1 -1
- flock/themes/desert.toml +1 -1
- flock/themes/django.toml +1 -1
- flock/themes/djangosmooth.toml +1 -1
- flock/themes/doomone.toml +1 -1
- flock/themes/dotgov.toml +1 -1
- flock/themes/dracula+.toml +1 -1
- flock/themes/duckbones.toml +1 -1
- flock/themes/encom.toml +1 -1
- flock/themes/espresso.toml +1 -1
- flock/themes/everblush.toml +1 -1
- flock/themes/fairyfloss.toml +1 -1
- flock/themes/fideloper.toml +1 -1
- flock/themes/fishtank.toml +1 -1
- flock/themes/flexoki-light.toml +1 -1
- flock/themes/floraverse.toml +1 -1
- flock/themes/framer.toml +1 -1
- flock/themes/galizur.toml +1 -1
- flock/themes/github.toml +1 -1
- flock/themes/grass.toml +1 -1
- flock/themes/grey-green.toml +1 -1
- flock/themes/gruvboxlight.toml +1 -1
- flock/themes/guezwhoz.toml +1 -1
- flock/themes/harper.toml +1 -1
- flock/themes/hax0r-blue.toml +1 -1
- flock/themes/hopscotch.256.toml +1 -1
- flock/themes/ic-green-ppl.toml +1 -1
- flock/themes/iceberg-dark.toml +1 -1
- flock/themes/japanesque.toml +1 -1
- flock/themes/jubi.toml +1 -1
- flock/themes/kibble.toml +1 -1
- flock/themes/kolorit.toml +1 -1
- flock/themes/kurokula.toml +1 -1
- flock/themes/materialdesigncolors.toml +1 -1
- flock/themes/matrix.toml +1 -1
- flock/themes/mellifluous.toml +1 -1
- flock/themes/midnight-in-mojave.toml +1 -1
- flock/themes/monokai-remastered.toml +1 -1
- flock/themes/monokai-soda.toml +1 -1
- flock/themes/neon.toml +1 -1
- flock/themes/neopolitan.toml +1 -1
- flock/themes/nord-light.toml +1 -1
- flock/themes/ocean.toml +1 -1
- flock/themes/onehalfdark.toml +1 -1
- flock/themes/onehalflight.toml +1 -1
- flock/themes/palenighthc.toml +1 -1
- flock/themes/paulmillr.toml +1 -1
- flock/themes/pencildark.toml +1 -1
- flock/themes/pnevma.toml +1 -1
- flock/themes/purple-rain.toml +1 -1
- flock/themes/purplepeter.toml +1 -1
- flock/themes/raycast-dark.toml +1 -1
- flock/themes/red-sands.toml +1 -1
- flock/themes/relaxed.toml +1 -1
- flock/themes/retro.toml +1 -1
- flock/themes/rose-pine.toml +1 -1
- flock/themes/royal.toml +1 -1
- flock/themes/ryuuko.toml +1 -1
- flock/themes/sakura.toml +1 -1
- flock/themes/scarlet-protocol.toml +1 -1
- flock/themes/seoulbones-dark.toml +1 -1
- flock/themes/shades-of-purple.toml +1 -1
- flock/themes/smyck.toml +1 -1
- flock/themes/softserver.toml +1 -1
- flock/themes/solarized-darcula.toml +1 -1
- flock/themes/square.toml +1 -1
- flock/themes/sugarplum.toml +1 -1
- flock/themes/thayer-bright.toml +1 -1
- flock/themes/tokyonight.toml +1 -1
- flock/themes/tomorrow.toml +1 -1
- flock/themes/ubuntu.toml +1 -1
- flock/themes/ultradark.toml +1 -1
- flock/themes/ultraviolent.toml +1 -1
- flock/themes/unikitty.toml +1 -1
- flock/themes/urple.toml +1 -1
- flock/themes/vesper.toml +1 -1
- flock/themes/vimbones.toml +1 -1
- flock/themes/wildcherry.toml +1 -1
- flock/themes/wilmersdorf.toml +1 -1
- flock/themes/wryan.toml +1 -1
- flock/themes/xcodedarkhc.toml +1 -1
- flock/themes/xcodelight.toml +1 -1
- flock/themes/zenbones-light.toml +1 -1
- flock/themes/zenwritten-dark.toml +1 -1
- flock/utilities.py +301 -0
- flock/{components/utility → utility}/output_utility_component.py +68 -53
- flock/visibility.py +107 -0
- flock_core-0.5.56b0.dist-info/METADATA +747 -0
- flock_core-0.5.56b0.dist-info/RECORD +398 -0
- flock_core-0.5.56b0.dist-info/entry_points.txt +2 -0
- {flock_core-0.5.0b28.dist-info → flock_core-0.5.56b0.dist-info}/licenses/LICENSE +1 -1
- flock/adapter/__init__.py +0 -14
- flock/adapter/azure_adapter.py +0 -68
- flock/adapter/chroma_adapter.py +0 -73
- flock/adapter/faiss_adapter.py +0 -97
- flock/adapter/pinecone_adapter.py +0 -51
- flock/adapter/vector_base.py +0 -47
- flock/cli/assets/release_notes.md +0 -140
- flock/cli/config.py +0 -8
- flock/cli/constants.py +0 -36
- flock/cli/create_agent.py +0 -1
- flock/cli/create_flock.py +0 -280
- flock/cli/execute_flock.py +0 -620
- flock/cli/load_agent.py +0 -1
- flock/cli/load_examples.py +0 -1
- flock/cli/load_flock.py +0 -192
- flock/cli/load_release_notes.py +0 -20
- flock/cli/loaded_flock_cli.py +0 -254
- flock/cli/manage_agents.py +0 -459
- flock/cli/registry_management.py +0 -889
- flock/cli/runner.py +0 -41
- flock/cli/settings.py +0 -857
- flock/cli/utils.py +0 -135
- flock/cli/view_results.py +0 -29
- flock/cli/yaml_editor.py +0 -396
- flock/components/__init__.py +0 -30
- flock/components/evaluation/__init__.py +0 -9
- flock/components/evaluation/declarative_evaluation_component.py +0 -606
- flock/components/routing/__init__.py +0 -15
- flock/components/routing/conditional_routing_component.py +0 -494
- flock/components/routing/default_routing_component.py +0 -103
- flock/components/routing/llm_routing_component.py +0 -206
- flock/components/utility/__init__.py +0 -22
- flock/components/utility/example_utility_component.py +0 -250
- flock/components/utility/feedback_utility_component.py +0 -206
- flock/components/utility/memory_utility_component.py +0 -550
- flock/components/utility/metrics_utility_component.py +0 -700
- flock/config.py +0 -61
- flock/core/__init__.py +0 -110
- flock/core/agent/__init__.py +0 -16
- flock/core/agent/default_agent.py +0 -216
- flock/core/agent/flock_agent_components.py +0 -104
- flock/core/agent/flock_agent_execution.py +0 -101
- flock/core/agent/flock_agent_integration.py +0 -260
- flock/core/agent/flock_agent_lifecycle.py +0 -186
- flock/core/agent/flock_agent_serialization.py +0 -381
- flock/core/api/__init__.py +0 -10
- flock/core/api/custom_endpoint.py +0 -45
- flock/core/api/endpoints.py +0 -254
- flock/core/api/main.py +0 -162
- flock/core/api/models.py +0 -97
- flock/core/api/run_store.py +0 -224
- flock/core/api/runner.py +0 -44
- flock/core/api/service.py +0 -214
- flock/core/component/__init__.py +0 -15
- flock/core/component/agent_component_base.py +0 -309
- flock/core/component/evaluation_component.py +0 -62
- flock/core/component/routing_component.py +0 -74
- flock/core/component/utility_component.py +0 -69
- flock/core/config/flock_agent_config.py +0 -58
- flock/core/config/scheduled_agent_config.py +0 -40
- flock/core/context/context.py +0 -213
- flock/core/context/context_manager.py +0 -37
- flock/core/context/context_vars.py +0 -10
- flock/core/evaluation/utils.py +0 -396
- flock/core/execution/batch_executor.py +0 -369
- flock/core/execution/evaluation_executor.py +0 -438
- flock/core/execution/local_executor.py +0 -31
- flock/core/execution/opik_executor.py +0 -103
- flock/core/execution/temporal_executor.py +0 -164
- flock/core/flock.py +0 -634
- flock/core/flock_agent.py +0 -336
- flock/core/flock_factory.py +0 -613
- flock/core/flock_scheduler.py +0 -166
- flock/core/flock_server_manager.py +0 -136
- flock/core/interpreter/python_interpreter.py +0 -689
- flock/core/mcp/__init__.py +0 -1
- flock/core/mcp/flock_mcp_server.py +0 -680
- flock/core/mcp/mcp_client_manager.py +0 -201
- flock/core/mcp/types/__init__.py +0 -1
- flock/core/mixin/dspy_integration.py +0 -403
- flock/core/mixin/prompt_parser.py +0 -125
- flock/core/orchestration/__init__.py +0 -15
- flock/core/orchestration/flock_batch_processor.py +0 -94
- flock/core/orchestration/flock_evaluator.py +0 -113
- flock/core/orchestration/flock_execution.py +0 -295
- flock/core/orchestration/flock_initialization.py +0 -149
- flock/core/orchestration/flock_server_manager.py +0 -67
- flock/core/orchestration/flock_web_server.py +0 -117
- flock/core/registry/__init__.py +0 -45
- flock/core/registry/agent_registry.py +0 -69
- flock/core/registry/callable_registry.py +0 -139
- flock/core/registry/component_discovery.py +0 -142
- flock/core/registry/component_registry.py +0 -64
- flock/core/registry/config_mapping.py +0 -64
- flock/core/registry/decorators.py +0 -137
- flock/core/registry/registry_hub.py +0 -205
- flock/core/registry/server_registry.py +0 -57
- flock/core/registry/type_registry.py +0 -86
- flock/core/serialization/__init__.py +0 -13
- flock/core/serialization/callable_registry.py +0 -52
- flock/core/serialization/flock_serializer.py +0 -832
- flock/core/serialization/json_encoder.py +0 -41
- flock/core/serialization/secure_serializer.py +0 -175
- flock/core/serialization/serializable.py +0 -342
- flock/core/serialization/serialization_utils.py +0 -412
- flock/core/util/file_path_utils.py +0 -223
- flock/core/util/hydrator.py +0 -309
- flock/core/util/input_resolver.py +0 -164
- flock/core/util/loader.py +0 -59
- flock/core/util/splitter.py +0 -219
- flock/di.py +0 -27
- flock/platform/docker_tools.py +0 -49
- flock/platform/jaeger_install.py +0 -86
- flock/webapp/__init__.py +0 -1
- flock/webapp/app/__init__.py +0 -0
- flock/webapp/app/api/__init__.py +0 -0
- flock/webapp/app/api/agent_management.py +0 -241
- flock/webapp/app/api/execution.py +0 -709
- flock/webapp/app/api/flock_management.py +0 -129
- flock/webapp/app/api/registry_viewer.py +0 -30
- flock/webapp/app/chat.py +0 -665
- flock/webapp/app/config.py +0 -104
- flock/webapp/app/dependencies.py +0 -117
- flock/webapp/app/main.py +0 -1070
- flock/webapp/app/middleware.py +0 -113
- flock/webapp/app/models_ui.py +0 -7
- flock/webapp/app/services/__init__.py +0 -0
- flock/webapp/app/services/feedback_file_service.py +0 -363
- flock/webapp/app/services/flock_service.py +0 -337
- flock/webapp/app/services/sharing_models.py +0 -81
- flock/webapp/app/services/sharing_store.py +0 -762
- flock/webapp/app/templates/theme_mapper.html +0 -326
- flock/webapp/app/theme_mapper.py +0 -812
- flock/webapp/app/utils.py +0 -85
- flock/webapp/run.py +0 -215
- flock/webapp/static/css/chat.css +0 -301
- flock/webapp/static/css/components.css +0 -167
- flock/webapp/static/css/header.css +0 -39
- flock/webapp/static/css/layout.css +0 -46
- flock/webapp/static/css/sidebar.css +0 -127
- flock/webapp/static/css/two-pane.css +0 -48
- flock/webapp/templates/base.html +0 -200
- flock/webapp/templates/chat.html +0 -152
- flock/webapp/templates/chat_settings.html +0 -19
- flock/webapp/templates/flock_editor.html +0 -16
- flock/webapp/templates/index.html +0 -12
- flock/webapp/templates/partials/_agent_detail_form.html +0 -93
- flock/webapp/templates/partials/_agent_list.html +0 -18
- flock/webapp/templates/partials/_agent_manager_view.html +0 -51
- flock/webapp/templates/partials/_agent_tools_checklist.html +0 -14
- flock/webapp/templates/partials/_chat_container.html +0 -15
- flock/webapp/templates/partials/_chat_messages.html +0 -57
- flock/webapp/templates/partials/_chat_settings_form.html +0 -85
- flock/webapp/templates/partials/_create_flock_form.html +0 -50
- flock/webapp/templates/partials/_dashboard_flock_detail.html +0 -17
- flock/webapp/templates/partials/_dashboard_flock_file_list.html +0 -16
- flock/webapp/templates/partials/_dashboard_flock_properties_preview.html +0 -28
- flock/webapp/templates/partials/_dashboard_upload_flock_form.html +0 -16
- flock/webapp/templates/partials/_dynamic_input_form_content.html +0 -22
- flock/webapp/templates/partials/_env_vars_table.html +0 -23
- flock/webapp/templates/partials/_execution_form.html +0 -118
- flock/webapp/templates/partials/_execution_view_container.html +0 -28
- flock/webapp/templates/partials/_flock_file_list.html +0 -23
- flock/webapp/templates/partials/_flock_properties_form.html +0 -52
- flock/webapp/templates/partials/_flock_upload_form.html +0 -16
- flock/webapp/templates/partials/_header_flock_status.html +0 -5
- flock/webapp/templates/partials/_load_manager_view.html +0 -49
- flock/webapp/templates/partials/_registry_table.html +0 -25
- flock/webapp/templates/partials/_registry_viewer_content.html +0 -70
- flock/webapp/templates/partials/_results_display.html +0 -78
- flock/webapp/templates/partials/_settings_env_content.html +0 -9
- flock/webapp/templates/partials/_settings_theme_content.html +0 -14
- flock/webapp/templates/partials/_settings_view.html +0 -36
- flock/webapp/templates/partials/_share_chat_link_snippet.html +0 -11
- flock/webapp/templates/partials/_share_link_snippet.html +0 -35
- flock/webapp/templates/partials/_sidebar.html +0 -74
- flock/webapp/templates/partials/_streaming_results_container.html +0 -195
- flock/webapp/templates/partials/_structured_data_view.html +0 -40
- flock/webapp/templates/partials/_theme_preview.html +0 -36
- flock/webapp/templates/registry_viewer.html +0 -84
- flock/webapp/templates/shared_run_page.html +0 -140
- flock/workflow/__init__.py +0 -0
- flock/workflow/activities.py +0 -196
- flock/workflow/agent_activities.py +0 -24
- flock/workflow/agent_execution_activity.py +0 -202
- flock/workflow/flock_workflow.py +0 -214
- flock/workflow/temporal_config.py +0 -96
- flock/workflow/temporal_setup.py +0 -68
- flock_core-0.5.0b28.dist-info/METADATA +0 -274
- flock_core-0.5.0b28.dist-info/RECORD +0 -561
- flock_core-0.5.0b28.dist-info/entry_points.txt +0 -2
- /flock/{core/logging → logging}/formatters/themes.py +0 -0
- /flock/{core/logging → logging}/span_middleware/baggage_span_processor.py +0 -0
- /flock/{core/mcp → mcp}/util/__init__.py +0 -0
- {flock_core-0.5.0b28.dist-info → flock_core-0.5.56b0.dist-info}/WHEEL +0 -0
flock/webapp/app/chat.py
DELETED
|
@@ -1,665 +0,0 @@
|
|
|
1
|
-
from __future__ import annotations
|
|
2
|
-
|
|
3
|
-
import ast # Add import ast
|
|
4
|
-
import json
|
|
5
|
-
from datetime import datetime
|
|
6
|
-
from typing import Literal
|
|
7
|
-
from uuid import uuid4
|
|
8
|
-
|
|
9
|
-
import markdown2 # Added for Markdown to HTML conversion
|
|
10
|
-
from fastapi import APIRouter, Depends, Form, Request, Response
|
|
11
|
-
from fastapi.responses import FileResponse, HTMLResponse
|
|
12
|
-
from pydantic import BaseModel
|
|
13
|
-
|
|
14
|
-
from flock.core.flock import Flock
|
|
15
|
-
from flock.core.logging.logging import get_logger
|
|
16
|
-
from flock.webapp.app.dependencies import get_shared_link_store
|
|
17
|
-
from flock.webapp.app.main import get_base_context_web, templates
|
|
18
|
-
from flock.webapp.app.services.feedback_file_service import (
|
|
19
|
-
create_csv_feedback_file,
|
|
20
|
-
create_csv_feedback_file_for_agent,
|
|
21
|
-
create_xlsx_feedback_file,
|
|
22
|
-
create_xlsx_feedback_file_for_agent,
|
|
23
|
-
)
|
|
24
|
-
from flock.webapp.app.services.sharing_models import (
|
|
25
|
-
FeedbackRecord,
|
|
26
|
-
SharedLinkConfig,
|
|
27
|
-
)
|
|
28
|
-
from flock.webapp.app.services.sharing_store import SharedLinkStoreInterface
|
|
29
|
-
|
|
30
|
-
router = APIRouter()
|
|
31
|
-
logger = get_logger("webapp.chat")
|
|
32
|
-
|
|
33
|
-
# ---------------------------------------------------------------------------
|
|
34
|
-
# In-memory session store (cookie-based). Not suitable for production scale.
|
|
35
|
-
# ---------------------------------------------------------------------------
|
|
36
|
-
_chat_sessions: dict[str, list[dict[str, str]]] = {}
|
|
37
|
-
|
|
38
|
-
COOKIE_NAME = "chat_sid"
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
def _ensure_session(request: Request) -> tuple[str, list[dict[str, str]]]:
|
|
42
|
-
"""Returns (sid, history_list) tuple and guarantees cookie presence."""
|
|
43
|
-
sid: str | None = request.cookies.get(COOKIE_NAME)
|
|
44
|
-
if not sid:
|
|
45
|
-
sid = uuid4().hex
|
|
46
|
-
if sid not in _chat_sessions:
|
|
47
|
-
_chat_sessions[sid] = []
|
|
48
|
-
return sid, _chat_sessions[sid]
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
def _get_history_for_shared_chat(request: Request, share_id: str) -> list[dict[str, str]]:
|
|
52
|
-
"""Manages history for a shared chat session, namespaced by share_id and user's session_id."""
|
|
53
|
-
user_sid: str | None = request.cookies.get(COOKIE_NAME)
|
|
54
|
-
if not user_sid: # Should have been set by _ensure_session on page load
|
|
55
|
-
user_sid = uuid4().hex
|
|
56
|
-
# Note: This history will be ephemeral if the cookie isn't set back to the client,
|
|
57
|
-
# but _ensure_session on the shared chat page load should handle cookie setting.
|
|
58
|
-
|
|
59
|
-
# Composite key for shared chat history
|
|
60
|
-
shared_session_key = f"shared_{share_id}_{user_sid}"
|
|
61
|
-
if shared_session_key not in _chat_sessions:
|
|
62
|
-
_chat_sessions[shared_session_key] = []
|
|
63
|
-
return _chat_sessions[shared_session_key]
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
# ---------------------------------------------------------------------------
|
|
67
|
-
# Chat configuration (per app instance for non-shared, or from SharedLinkConfig for shared)
|
|
68
|
-
# ---------------------------------------------------------------------------
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
class ChatConfig(BaseModel):
|
|
72
|
-
agent_name: str | None = None # Name of the Flock agent to chat with
|
|
73
|
-
message_key: str = "message"
|
|
74
|
-
history_key: str = "history"
|
|
75
|
-
response_key: str = "response"
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
# Store a single global chat config on the FastAPI app state for non-shared chat
|
|
79
|
-
def get_chat_config(request: Request) -> ChatConfig:
|
|
80
|
-
if not hasattr(request.app.state, "chat_config"):
|
|
81
|
-
request.app.state.chat_config = ChatConfig()
|
|
82
|
-
return request.app.state.chat_config
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
# ---------------------------------------------------------------------------
|
|
86
|
-
# Helper for Shared Chat Context
|
|
87
|
-
# ---------------------------------------------------------------------------
|
|
88
|
-
async def _get_shared_chat_context(
|
|
89
|
-
request: Request,
|
|
90
|
-
share_id: str,
|
|
91
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)
|
|
92
|
-
) -> tuple[ChatConfig | None, Flock | None, SharedLinkConfig | None]:
|
|
93
|
-
shared_config_db = await store.get_config(share_id)
|
|
94
|
-
|
|
95
|
-
if not shared_config_db or shared_config_db.share_type != "chat":
|
|
96
|
-
logger.warning(f"Shared chat link {share_id} not found or not a chat share type.")
|
|
97
|
-
return None, None, None
|
|
98
|
-
|
|
99
|
-
# Retrieve the pre-loaded Flock instance for this share_id
|
|
100
|
-
# This is loaded by the /chat/shared/{share_id} endpoint in main.py (or will be)
|
|
101
|
-
# For chat.py, we will create a specific /chat/shared/{share_id} endpoint
|
|
102
|
-
|
|
103
|
-
loaded_flock: Flock | None = None
|
|
104
|
-
if hasattr(request.app.state, 'shared_flocks') and share_id in request.app.state.shared_flocks:
|
|
105
|
-
loaded_flock = request.app.state.shared_flocks[share_id]
|
|
106
|
-
else:
|
|
107
|
-
# Attempt to load on-the-fly if not found (e.g., direct API call without page load)
|
|
108
|
-
# This is a fallback and might be slower if the Flock definition is large.
|
|
109
|
-
# The main /chat/shared/{share_id} page route should pre-load this.
|
|
110
|
-
try:
|
|
111
|
-
from flock.core.flock import Flock as ConcreteFlock # Local import
|
|
112
|
-
loaded_flock = ConcreteFlock.from_yaml(shared_config_db.flock_definition)
|
|
113
|
-
if not hasattr(request.app.state, 'shared_flocks'):
|
|
114
|
-
request.app.state.shared_flocks = {}
|
|
115
|
-
request.app.state.shared_flocks[share_id] = loaded_flock # Cache it
|
|
116
|
-
logger.info(f"On-the-fly load of Flock for shared chat {share_id}.")
|
|
117
|
-
except Exception as e_load:
|
|
118
|
-
logger.error(f"Failed to load Flock from definition for shared chat {share_id}: {e_load}", exc_info=True)
|
|
119
|
-
return None, None, shared_config_db
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
frozen_chat_cfg = ChatConfig(
|
|
123
|
-
agent_name=shared_config_db.agent_name, # agent_name from SharedLinkConfig is the chat agent
|
|
124
|
-
message_key=shared_config_db.chat_message_key or "message",
|
|
125
|
-
history_key=shared_config_db.chat_history_key or "history",
|
|
126
|
-
response_key=shared_config_db.chat_response_key or "response",
|
|
127
|
-
)
|
|
128
|
-
return frozen_chat_cfg, loaded_flock, shared_config_db
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
# ---------------------------------------------------------------------------
|
|
132
|
-
# Routes
|
|
133
|
-
# ---------------------------------------------------------------------------
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
@router.get("/chat", response_class=HTMLResponse, tags=["Chat"])
|
|
137
|
-
async def chat_page(request: Request):
|
|
138
|
-
"""Full-page chat UI (works even when the main UI is disabled)."""
|
|
139
|
-
sid, history = _ensure_session(request)
|
|
140
|
-
cfg = get_chat_config(request)
|
|
141
|
-
context = get_base_context_web(request, ui_mode="standalone")
|
|
142
|
-
context.update({"history": history, "chat_cfg": cfg, "chat_subtitle": f"Agent: {cfg.agent_name}" if cfg.agent_name else "Echo demo", "is_shared_chat": False, "share_id": None})
|
|
143
|
-
response = templates.TemplateResponse("chat.html", context)
|
|
144
|
-
# Set cookie if not already present
|
|
145
|
-
if COOKIE_NAME not in request.cookies:
|
|
146
|
-
response.set_cookie(COOKIE_NAME, sid, max_age=60 * 60 * 24 * 7)
|
|
147
|
-
return response
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
@router.get("/chat/messages", response_class=HTMLResponse, tags=["Chat"], include_in_schema=False)
|
|
151
|
-
async def chat_history_partial(request: Request):
|
|
152
|
-
"""HTMX endpoint that returns the rendered message list."""
|
|
153
|
-
_, history = _ensure_session(request)
|
|
154
|
-
return templates.TemplateResponse(
|
|
155
|
-
"partials/_chat_messages.html",
|
|
156
|
-
{"request": request, "history": history, "now": datetime.now}
|
|
157
|
-
)
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
@router.post("/chat/send", response_class=HTMLResponse, tags=["Chat"])
|
|
161
|
-
async def chat_send(request: Request, message: str = Form(...)):
|
|
162
|
-
"""Echo-back mock implementation. Adds user msg + bot reply to history."""
|
|
163
|
-
_, history = _ensure_session(request)
|
|
164
|
-
current_time = datetime.now().strftime('%H:%M')
|
|
165
|
-
cfg = get_chat_config(request)
|
|
166
|
-
history.append({"role": "user", "text": message, "timestamp": current_time})
|
|
167
|
-
start_time = datetime.now()
|
|
168
|
-
is_error = False # Initialize is_error
|
|
169
|
-
|
|
170
|
-
flock_inst = getattr(request.app.state, "flock_instance", None)
|
|
171
|
-
bot_agent = cfg.agent_name if cfg.agent_name else None
|
|
172
|
-
bot_text: str
|
|
173
|
-
|
|
174
|
-
if bot_agent and flock_inst and bot_agent in getattr(flock_inst, "agents", {}):
|
|
175
|
-
run_input: dict = {}
|
|
176
|
-
if cfg.message_key: run_input[cfg.message_key] = message
|
|
177
|
-
if cfg.history_key: run_input[cfg.history_key] = [h["text"] for h in history if h.get("role") == "user" or h.get("role") == "bot"] # Simple text history
|
|
178
|
-
|
|
179
|
-
try:
|
|
180
|
-
result_dict = await flock_inst.run_async(start_agent=bot_agent, input=run_input, box_result=False)
|
|
181
|
-
# Assuming result_dict might be the actual dict, or its string representation is what we need.
|
|
182
|
-
# For now, we work with bot_text derived from it.
|
|
183
|
-
if cfg.response_key:
|
|
184
|
-
bot_text = str(result_dict.get(cfg.response_key, result_dict))
|
|
185
|
-
else:
|
|
186
|
-
bot_text = str(result_dict)
|
|
187
|
-
|
|
188
|
-
except Exception as e:
|
|
189
|
-
bot_text = f"Error: {e}"
|
|
190
|
-
is_error = True
|
|
191
|
-
|
|
192
|
-
if not is_error:
|
|
193
|
-
original_bot_text = bot_text # Keep a copy
|
|
194
|
-
formatted_as_json = False
|
|
195
|
-
|
|
196
|
-
stripped_text = bot_text.strip()
|
|
197
|
-
if (stripped_text.startswith('{') and stripped_text.endswith('}')) or \
|
|
198
|
-
(stripped_text.startswith('[') and stripped_text.endswith(']')):
|
|
199
|
-
try:
|
|
200
|
-
parsed_obj = json.loads(bot_text)
|
|
201
|
-
if isinstance(parsed_obj, (dict, list)):
|
|
202
|
-
pretty_json = json.dumps(parsed_obj, indent=2).replace('\\n', '\n')
|
|
203
|
-
bot_text = f'''<pre><code class="language-json">{pretty_json}</code></pre>'''
|
|
204
|
-
formatted_as_json = True
|
|
205
|
-
except json.JSONDecodeError:
|
|
206
|
-
try:
|
|
207
|
-
evaluated_obj = ast.literal_eval(bot_text)
|
|
208
|
-
if isinstance(evaluated_obj, (dict, list)):
|
|
209
|
-
pretty_json = json.dumps(evaluated_obj, indent=2).replace('\\n', '\n')
|
|
210
|
-
bot_text = f'''<pre><code class="language-json">{pretty_json}</code></pre>'''
|
|
211
|
-
formatted_as_json = True
|
|
212
|
-
except (ValueError, SyntaxError, TypeError):
|
|
213
|
-
pass # Fall through
|
|
214
|
-
except Exception as e_json_fmt:
|
|
215
|
-
logger.error(f"Error formatting likely JSON: {e_json_fmt}. Original: {original_bot_text[:200]}", exc_info=True)
|
|
216
|
-
bot_text = original_bot_text
|
|
217
|
-
|
|
218
|
-
if not formatted_as_json:
|
|
219
|
-
try:
|
|
220
|
-
bot_text = markdown2.markdown(original_bot_text, extras=["fenced-code-blocks", "tables", "break-on-newline"])
|
|
221
|
-
except Exception:
|
|
222
|
-
logger.error(f"Error during Markdown conversion for bot_text. Original: {original_bot_text[:200]}", exc_info=True)
|
|
223
|
-
bot_text = original_bot_text # Fallback to original text, will be HTML escaped by Jinja if not |safe
|
|
224
|
-
|
|
225
|
-
else:
|
|
226
|
-
# Fallback echo behavior or agent not found messages
|
|
227
|
-
is_error = True # Treat these as plain text, no special formatting
|
|
228
|
-
if bot_agent and not flock_inst:
|
|
229
|
-
bot_text = f"Agent '{bot_agent}' configured, but no Flock loaded."
|
|
230
|
-
elif bot_agent and flock_inst and bot_agent not in getattr(flock_inst, "agents", {}):
|
|
231
|
-
bot_text = f"Agent '{bot_agent}' configured, but not found in the loaded Flock."
|
|
232
|
-
else: # No agent configured
|
|
233
|
-
bot_text = f"Echo: {message}"
|
|
234
|
-
# If even echo should be markdown, remove is_error=True here and let it pass through. For now, plain.
|
|
235
|
-
|
|
236
|
-
duration_ms = int((datetime.now() - start_time).total_seconds() * 1000)
|
|
237
|
-
history.append({
|
|
238
|
-
"role": "bot",
|
|
239
|
-
"text": bot_text,
|
|
240
|
-
"timestamp": current_time,
|
|
241
|
-
"agent": bot_agent or "echo",
|
|
242
|
-
"duration_ms": duration_ms,
|
|
243
|
-
"raw_json": original_bot_text if 'original_bot_text' in locals() else bot_text,
|
|
244
|
-
"flock_yaml": getattr(flock_inst, 'to_yaml', lambda: "")()
|
|
245
|
-
})
|
|
246
|
-
# Return updated history partial
|
|
247
|
-
return templates.TemplateResponse(
|
|
248
|
-
"partials/_chat_messages.html",
|
|
249
|
-
{"request": request, "history": history, "now": datetime.now}
|
|
250
|
-
)
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
@router.get("/ui/htmx/chat-view", response_class=HTMLResponse, tags=["Chat"], include_in_schema=False)
|
|
254
|
-
async def chat_container_partial(request: Request):
|
|
255
|
-
_ensure_session(request)
|
|
256
|
-
return templates.TemplateResponse("partials/_chat_container.html", {"request": request})
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
# ---------------------------------------------------------------------------
|
|
260
|
-
# Chat settings management
|
|
261
|
-
# ---------------------------------------------------------------------------
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
@router.get("/ui/htmx/chat-settings-form", response_class=HTMLResponse, include_in_schema=False)
|
|
265
|
-
async def chat_settings_form(request: Request):
|
|
266
|
-
"""Returns the form for configuring chat behaviour (HTMX partial)."""
|
|
267
|
-
cfg = get_chat_config(request)
|
|
268
|
-
flock_inst = getattr(request.app.state, "flock_instance", None)
|
|
269
|
-
input_fields, output_fields = [], []
|
|
270
|
-
if cfg.agent_name and flock_inst and cfg.agent_name in flock_inst.agents:
|
|
271
|
-
agent_obj = flock_inst.agents[cfg.agent_name]
|
|
272
|
-
# Expect signatures like "field: type | desc, ..." or "field: type" etc.
|
|
273
|
-
def _extract(sig: str):
|
|
274
|
-
fields = []
|
|
275
|
-
for seg in sig.split(','):
|
|
276
|
-
parts = seg.strip().split(':')
|
|
277
|
-
if parts:
|
|
278
|
-
fields.append(parts[0].strip())
|
|
279
|
-
return [f for f in fields if f]
|
|
280
|
-
input_fields = _extract(agent_obj.input) if getattr(agent_obj, 'input', '') else []
|
|
281
|
-
output_fields = _extract(agent_obj.output) if getattr(agent_obj, 'output', '') else []
|
|
282
|
-
|
|
283
|
-
context = get_base_context_web(request)
|
|
284
|
-
context.update({
|
|
285
|
-
"chat_cfg": cfg,
|
|
286
|
-
"current_flock": flock_inst,
|
|
287
|
-
"input_fields": input_fields,
|
|
288
|
-
"output_fields": output_fields,
|
|
289
|
-
})
|
|
290
|
-
return templates.TemplateResponse("partials/_chat_settings_form.html", context)
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
@router.post("/chat/settings", include_in_schema=False)
|
|
294
|
-
async def chat_settings_submit(
|
|
295
|
-
request: Request,
|
|
296
|
-
agent_name: str | None = Form(default=None),
|
|
297
|
-
message_key: str = Form("message"),
|
|
298
|
-
history_key: str = Form("history"),
|
|
299
|
-
response_key: str = Form("response"),
|
|
300
|
-
):
|
|
301
|
-
"""Handles chat settings submission and triggers a toast notification."""
|
|
302
|
-
cfg = get_chat_config(request)
|
|
303
|
-
cfg.agent_name = agent_name
|
|
304
|
-
cfg.message_key = message_key
|
|
305
|
-
cfg.history_key = history_key
|
|
306
|
-
cfg.response_key = response_key
|
|
307
|
-
|
|
308
|
-
logger.info(f"Chat settings updated: Agent: {cfg.agent_name}, MsgKey: {cfg.message_key}, HistKey: {cfg.history_key}, RespKey: {cfg.response_key}")
|
|
309
|
-
|
|
310
|
-
toast_event = {
|
|
311
|
-
"showGlobalToast": {
|
|
312
|
-
"message": "Chat settings saved successfully!",
|
|
313
|
-
"type": "success"
|
|
314
|
-
}
|
|
315
|
-
}
|
|
316
|
-
headers = {"HX-Trigger": json.dumps(toast_event)}
|
|
317
|
-
return Response(status_code=204, headers=headers)
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
# --- Stand-alone Chat HTML page access to settings --------------------------
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
@router.get("/chat/settings-standalone", response_class=HTMLResponse, tags=["Chat"], include_in_schema=False)
|
|
324
|
-
async def chat_settings_standalone(request: Request):
|
|
325
|
-
"""Standalone page to render chat settings (used by full-page chat HTML)."""
|
|
326
|
-
cfg = get_chat_config(request)
|
|
327
|
-
context = get_base_context_web(request, ui_mode="standalone")
|
|
328
|
-
context.update({
|
|
329
|
-
"chat_cfg": cfg,
|
|
330
|
-
"current_flock": getattr(request.app.state, "flock_instance", None),
|
|
331
|
-
})
|
|
332
|
-
return templates.TemplateResponse("chat_settings.html", context)
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
# ---------------------------------------------------------------------------
|
|
336
|
-
# Stand-alone HTMX partials (chat view & settings) for in-page swapping
|
|
337
|
-
# ---------------------------------------------------------------------------
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
@router.get("/chat/htmx/chat-view", response_class=HTMLResponse, include_in_schema=False)
|
|
341
|
-
async def htmx_chat_view(request: Request):
|
|
342
|
-
"""Return chat container partial for standalone page reload via HTMX."""
|
|
343
|
-
_ensure_session(request)
|
|
344
|
-
return templates.TemplateResponse("partials/_chat_container.html", {"request": request})
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
@router.get("/chat/htmx/settings-form", response_class=HTMLResponse, include_in_schema=False)
|
|
348
|
-
async def htmx_chat_settings_partial(request: Request):
|
|
349
|
-
cfg = get_chat_config(request)
|
|
350
|
-
# Allow temporarily selecting agent via query param without saving
|
|
351
|
-
agent_override = request.query_params.get("agent_name")
|
|
352
|
-
if agent_override is not None:
|
|
353
|
-
cfg = cfg.copy()
|
|
354
|
-
cfg.agent_name = agent_override or None
|
|
355
|
-
|
|
356
|
-
flock_inst = getattr(request.app.state, "flock_instance", None)
|
|
357
|
-
input_fields, output_fields = [], []
|
|
358
|
-
if cfg.agent_name and flock_inst and cfg.agent_name in flock_inst.agents:
|
|
359
|
-
agent_obj = flock_inst.agents[cfg.agent_name]
|
|
360
|
-
def _extract(sig: str):
|
|
361
|
-
return [seg.strip().split(':')[0].strip() for seg in sig.split(',') if seg.strip()]
|
|
362
|
-
input_fields = _extract(agent_obj.input) if getattr(agent_obj, 'input', '') else []
|
|
363
|
-
output_fields = _extract(agent_obj.output) if getattr(agent_obj, 'output', '') else []
|
|
364
|
-
|
|
365
|
-
context = {"request": request, "chat_cfg": cfg, "current_flock": flock_inst, "input_fields": input_fields, "output_fields": output_fields}
|
|
366
|
-
return templates.TemplateResponse("partials/_chat_settings_form.html", context)
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
# ---------------------------------------------------------------------------
|
|
370
|
-
# Shared Chat Routes
|
|
371
|
-
# ---------------------------------------------------------------------------
|
|
372
|
-
|
|
373
|
-
@router.get("/chat/shared/{share_id}", response_class=HTMLResponse, tags=["Chat Sharing"])
|
|
374
|
-
async def page_shared_chat(
|
|
375
|
-
request: Request,
|
|
376
|
-
share_id: str,
|
|
377
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)
|
|
378
|
-
):
|
|
379
|
-
"""Serves the chat page for a shared chat session."""
|
|
380
|
-
logger.info(f"Accessing shared chat page for share_id: {share_id}")
|
|
381
|
-
|
|
382
|
-
sid, _ = _ensure_session(request) # Ensures user has a session for history tracking
|
|
383
|
-
|
|
384
|
-
shared_config_db = await store.get_config(share_id)
|
|
385
|
-
|
|
386
|
-
if not shared_config_db or shared_config_db.share_type != "chat":
|
|
387
|
-
logger.warning(f"Shared chat link {share_id} not found or not a chat share type.")
|
|
388
|
-
# Consider rendering an error template or redirecting
|
|
389
|
-
error_context = get_base_context_web(request, ui_mode="standalone", error="Shared chat link is invalid or has expired.")
|
|
390
|
-
return templates.TemplateResponse("error_page.html", {**error_context, "error_title": "Invalid Link"}, status_code=404)
|
|
391
|
-
|
|
392
|
-
# Load Flock from definition and cache in app.state.shared_flocks
|
|
393
|
-
loaded_flock: Flock | None = None
|
|
394
|
-
if hasattr(request.app.state, 'shared_flocks') and share_id in request.app.state.shared_flocks:
|
|
395
|
-
loaded_flock = request.app.state.shared_flocks[share_id]
|
|
396
|
-
else:
|
|
397
|
-
try:
|
|
398
|
-
from flock.core.flock import Flock as ConcreteFlock
|
|
399
|
-
loaded_flock = ConcreteFlock.from_yaml(shared_config_db.flock_definition)
|
|
400
|
-
if not hasattr(request.app.state, 'shared_flocks'):
|
|
401
|
-
request.app.state.shared_flocks = {}
|
|
402
|
-
request.app.state.shared_flocks[share_id] = loaded_flock
|
|
403
|
-
logger.info(f"Loaded and cached Flock for shared chat {share_id} in app.state.shared_flocks.")
|
|
404
|
-
except Exception as e_load:
|
|
405
|
-
logger.error(f"Fatal: Could not load Flock from definition for shared chat {share_id}: {e_load}", exc_info=True)
|
|
406
|
-
error_context = get_base_context_web(request, ui_mode="standalone", error=f"Could not load the shared Flock configuration: {e_load!s}")
|
|
407
|
-
return templates.TemplateResponse("error_page.html", {**error_context, "error_title": "Configuration Error"}, status_code=500)
|
|
408
|
-
|
|
409
|
-
frozen_chat_cfg = ChatConfig(
|
|
410
|
-
agent_name=shared_config_db.agent_name,
|
|
411
|
-
message_key=shared_config_db.chat_message_key or "message",
|
|
412
|
-
history_key=shared_config_db.chat_history_key or "history",
|
|
413
|
-
response_key=shared_config_db.chat_response_key or "response",
|
|
414
|
-
)
|
|
415
|
-
|
|
416
|
-
# Get history specific to this user and this shared chat
|
|
417
|
-
history = _get_history_for_shared_chat(request, share_id)
|
|
418
|
-
|
|
419
|
-
context = get_base_context_web(request, ui_mode="standalone")
|
|
420
|
-
context.update({
|
|
421
|
-
"history": history, # User-specific history for this shared chat
|
|
422
|
-
"chat_cfg": frozen_chat_cfg, # The "frozen" config from the share link
|
|
423
|
-
"chat_subtitle": f"Shared Chat - Agent: {frozen_chat_cfg.agent_name}" if frozen_chat_cfg.agent_name else "Shared Echo Chat",
|
|
424
|
-
"is_shared_chat": True,
|
|
425
|
-
"share_id": share_id,
|
|
426
|
-
"flock": loaded_flock # Pass flock for potential display, though backend uses cached one
|
|
427
|
-
})
|
|
428
|
-
|
|
429
|
-
response = templates.TemplateResponse("chat.html", context)
|
|
430
|
-
if COOKIE_NAME not in request.cookies: # Ensure cookie is set if _ensure_session created a new one
|
|
431
|
-
response.set_cookie(COOKIE_NAME, sid, max_age=60 * 60 * 24 * 7)
|
|
432
|
-
return response
|
|
433
|
-
|
|
434
|
-
@router.get("/chat/messages-shared/{share_id}", response_class=HTMLResponse, tags=["Chat Sharing"], include_in_schema=False)
|
|
435
|
-
async def chat_history_partial_shared(request: Request, share_id: str):
|
|
436
|
-
"""HTMX endpoint that returns the rendered message list for a shared chat."""
|
|
437
|
-
# _ensure_session called on page load, so cookie should exist for history keying
|
|
438
|
-
history = _get_history_for_shared_chat(request, share_id)
|
|
439
|
-
return templates.TemplateResponse(
|
|
440
|
-
"partials/_chat_messages.html",
|
|
441
|
-
{"request": request, "history": history, "now": datetime.now}
|
|
442
|
-
)
|
|
443
|
-
|
|
444
|
-
@router.post("/chat/send-shared", response_class=HTMLResponse, tags=["Chat Sharing"])
|
|
445
|
-
async def chat_send_shared(
|
|
446
|
-
request: Request,
|
|
447
|
-
share_id: str = Form(...),
|
|
448
|
-
message: str = Form(...),
|
|
449
|
-
# Note: Dependencies need to be declared at the route level for FastAPI to inject them.
|
|
450
|
-
# So, we re-declare get_shared_link_store here or pass it to the helper if FastAPI handles sub-dependencies.
|
|
451
|
-
# For simplicity with current structure, let _get_shared_chat_context handle its own dependency.
|
|
452
|
-
# We can also make _get_shared_chat_context a Depends() if preferred.
|
|
453
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)
|
|
454
|
-
):
|
|
455
|
-
"""Handles message sending for a shared chat session."""
|
|
456
|
-
frozen_chat_cfg, flock_inst, _ = await _get_shared_chat_context(request, share_id, store)
|
|
457
|
-
is_error = False # Initialize is_error
|
|
458
|
-
|
|
459
|
-
if not frozen_chat_cfg or not flock_inst:
|
|
460
|
-
# Error response if config or flock couldn't be loaded
|
|
461
|
-
# This history is ephemeral as it won't be saved if the config is bad
|
|
462
|
-
error_history = [{"role": "bot", "text": "Error: Shared chat configuration is invalid or Flock not found.", "timestamp": datetime.now().strftime('%H:%M')}]
|
|
463
|
-
return templates.TemplateResponse(
|
|
464
|
-
"partials/_chat_messages.html",
|
|
465
|
-
{"request": request, "history": error_history, "now": datetime.now},
|
|
466
|
-
status_code=404
|
|
467
|
-
)
|
|
468
|
-
|
|
469
|
-
history = _get_history_for_shared_chat(request, share_id)
|
|
470
|
-
current_time = datetime.now().strftime('%H:%M')
|
|
471
|
-
history.append({"role": "user", "text": message, "timestamp": current_time})
|
|
472
|
-
start_time = datetime.now()
|
|
473
|
-
|
|
474
|
-
bot_agent = frozen_chat_cfg.agent_name
|
|
475
|
-
bot_text: str
|
|
476
|
-
|
|
477
|
-
if bot_agent and bot_agent in getattr(flock_inst, "agents", {}):
|
|
478
|
-
run_input: dict = {}
|
|
479
|
-
if frozen_chat_cfg.message_key: run_input[frozen_chat_cfg.message_key] = message
|
|
480
|
-
if frozen_chat_cfg.history_key: run_input[frozen_chat_cfg.history_key] = [h["text"] for h in history if h.get("role") == "user" or h.get("role") == "bot"]
|
|
481
|
-
|
|
482
|
-
try:
|
|
483
|
-
result_dict = await flock_inst.run_async(agent=bot_agent, input=run_input, box_result=False)
|
|
484
|
-
if frozen_chat_cfg.response_key:
|
|
485
|
-
bot_text = str(result_dict.get(frozen_chat_cfg.response_key, result_dict))
|
|
486
|
-
else:
|
|
487
|
-
bot_text = str(result_dict)
|
|
488
|
-
|
|
489
|
-
except Exception as e:
|
|
490
|
-
bot_text = f"Error running agent {bot_agent} in shared chat: {e}"
|
|
491
|
-
is_error = True
|
|
492
|
-
logger.error(f"Error in /chat/send-shared (agent: {bot_agent}, share: {share_id}): {e}", exc_info=True)
|
|
493
|
-
|
|
494
|
-
if not is_error:
|
|
495
|
-
original_bot_text = bot_text # Keep a copy
|
|
496
|
-
formatted_as_json = False
|
|
497
|
-
|
|
498
|
-
stripped_text = bot_text.strip()
|
|
499
|
-
if (stripped_text.startswith('{') and stripped_text.endswith('}')) or \
|
|
500
|
-
(stripped_text.startswith('[') and stripped_text.endswith(']')):
|
|
501
|
-
try:
|
|
502
|
-
parsed_obj = json.loads(bot_text)
|
|
503
|
-
if isinstance(parsed_obj, (dict, list)):
|
|
504
|
-
pretty_json = json.dumps(parsed_obj, indent=2).replace('\\n', '\n')
|
|
505
|
-
bot_text = f'''<pre><code class="language-json">{pretty_json}</code></pre>'''
|
|
506
|
-
formatted_as_json = True
|
|
507
|
-
except json.JSONDecodeError:
|
|
508
|
-
try:
|
|
509
|
-
evaluated_obj = ast.literal_eval(bot_text)
|
|
510
|
-
if isinstance(evaluated_obj, (dict, list)):
|
|
511
|
-
pretty_json = json.dumps(evaluated_obj, indent=2).replace('\\n', '\n')
|
|
512
|
-
bot_text = f'''<pre><code class="language-json">{pretty_json}</code></pre>'''
|
|
513
|
-
formatted_as_json = True
|
|
514
|
-
except (ValueError, SyntaxError, TypeError):
|
|
515
|
-
pass # Fall through
|
|
516
|
-
except Exception as e_json_fmt:
|
|
517
|
-
logger.error(f"Error formatting likely JSON (shared chat): {e_json_fmt}. Original: {original_bot_text[:200]}", exc_info=True)
|
|
518
|
-
bot_text = original_bot_text
|
|
519
|
-
|
|
520
|
-
if not formatted_as_json:
|
|
521
|
-
try:
|
|
522
|
-
bot_text = markdown2.markdown(original_bot_text, extras=["fenced-code-blocks", "tables", "break-on-newline"])
|
|
523
|
-
except Exception:
|
|
524
|
-
logger.error(f"Error during Markdown conversion for shared chat bot_text. Original: {original_bot_text[:200]}", exc_info=True)
|
|
525
|
-
bot_text = original_bot_text
|
|
526
|
-
else:
|
|
527
|
-
# Fallback if agent misconfigured or not found in the specific shared flock
|
|
528
|
-
is_error = True # Treat these as plain text
|
|
529
|
-
if bot_agent and bot_agent not in getattr(flock_inst, "agents", {}):
|
|
530
|
-
bot_text = f"Agent '{bot_agent}' (shared) not found in its Flock."
|
|
531
|
-
elif not bot_agent:
|
|
532
|
-
bot_text = f"No agent configured for this shared chat. Echoing: {message}"
|
|
533
|
-
else: # Should not happen if frozen_chat_cfg and flock_inst were valid earlier
|
|
534
|
-
bot_text = f"Shared Echo: {message}"
|
|
535
|
-
|
|
536
|
-
duration_ms = int((datetime.now() - start_time).total_seconds() * 1000)
|
|
537
|
-
history.append({
|
|
538
|
-
"role": "bot",
|
|
539
|
-
"text": bot_text,
|
|
540
|
-
"timestamp": current_time,
|
|
541
|
-
"agent": bot_agent or "shared-echo",
|
|
542
|
-
"duration_ms": duration_ms,
|
|
543
|
-
"raw_json": original_bot_text if 'original_bot_text' in locals() else bot_text,
|
|
544
|
-
"flock_yaml": getattr(flock_inst, 'to_yaml', lambda: "")()
|
|
545
|
-
})
|
|
546
|
-
|
|
547
|
-
return templates.TemplateResponse(
|
|
548
|
-
"partials/_chat_messages.html",
|
|
549
|
-
{"request": request, "history": history, "now": datetime.now}
|
|
550
|
-
)
|
|
551
|
-
|
|
552
|
-
# ---------------- Feedback endpoints ----------------
|
|
553
|
-
@router.post("/chat/htmx/feedback", response_class=HTMLResponse, include_in_schema=False)
|
|
554
|
-
async def chat_feedback(request: Request,
|
|
555
|
-
reason: str = Form(...),
|
|
556
|
-
expected_response: str | None = Form(None),
|
|
557
|
-
actual_response: str | None = Form(None),
|
|
558
|
-
flock_definition: str | None = Form(None),
|
|
559
|
-
agent_name: str | None = Form(None),
|
|
560
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)):
|
|
561
|
-
from uuid import uuid4
|
|
562
|
-
rec = FeedbackRecord(
|
|
563
|
-
feedback_id=uuid4().hex,
|
|
564
|
-
share_id=None,
|
|
565
|
-
context_type="chat",
|
|
566
|
-
reason=reason,
|
|
567
|
-
expected_response=expected_response,
|
|
568
|
-
actual_response=actual_response,
|
|
569
|
-
flock_definition=flock_definition,
|
|
570
|
-
agent_name=agent_name,
|
|
571
|
-
)
|
|
572
|
-
await store.save_feedback(rec)
|
|
573
|
-
toast_event = {
|
|
574
|
-
"showGlobalToast": {
|
|
575
|
-
"message": "Feedback received! Thanks",
|
|
576
|
-
"type": "success"
|
|
577
|
-
}
|
|
578
|
-
}
|
|
579
|
-
headers = {"HX-Trigger": json.dumps(toast_event)}
|
|
580
|
-
return Response(status_code=204, headers=headers)
|
|
581
|
-
|
|
582
|
-
@router.post("/chat/htmx/feedback-shared", response_class=HTMLResponse, include_in_schema=False)
|
|
583
|
-
async def chat_feedback_shared(request: Request,
|
|
584
|
-
share_id: str = Form(...),
|
|
585
|
-
reason: str = Form(...),
|
|
586
|
-
expected_response: str | None = Form(None),
|
|
587
|
-
actual_response: str | None = Form(None),
|
|
588
|
-
flock_definition: str | None = Form(None),
|
|
589
|
-
agent_name: str | None = Form(None),
|
|
590
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)):
|
|
591
|
-
from uuid import uuid4
|
|
592
|
-
rec = FeedbackRecord(
|
|
593
|
-
feedback_id=uuid4().hex,
|
|
594
|
-
share_id=share_id,
|
|
595
|
-
context_type="chat",
|
|
596
|
-
reason=reason,
|
|
597
|
-
expected_response=expected_response,
|
|
598
|
-
actual_response=actual_response,
|
|
599
|
-
flock_definition=flock_definition,
|
|
600
|
-
agent_name=agent_name,
|
|
601
|
-
)
|
|
602
|
-
await store.save_feedback(rec)
|
|
603
|
-
toast_event = {
|
|
604
|
-
"showGlobalToast": {
|
|
605
|
-
"message": "Feedback received! Thanks",
|
|
606
|
-
"type": "success"
|
|
607
|
-
}
|
|
608
|
-
}
|
|
609
|
-
headers = {"HX-Trigger": json.dumps(toast_event)}
|
|
610
|
-
return Response(status_code=204, headers=headers)
|
|
611
|
-
|
|
612
|
-
@router.get("/chat/htmx/feedback-download/{format}", response_class=FileResponse, include_in_schema=False)
|
|
613
|
-
async def chat_feedback_download_all(
|
|
614
|
-
request: Request,
|
|
615
|
-
format: Literal["csv", "xlsx"] = "csv",
|
|
616
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)
|
|
617
|
-
):
|
|
618
|
-
"""Download all feedback records for all agents."""
|
|
619
|
-
if format == "csv":
|
|
620
|
-
return await create_csv_feedback_file(
|
|
621
|
-
request=request,
|
|
622
|
-
store=store,
|
|
623
|
-
separator=","
|
|
624
|
-
)
|
|
625
|
-
elif format == "xlsx":
|
|
626
|
-
return await create_xlsx_feedback_file(
|
|
627
|
-
request=request,
|
|
628
|
-
store=store,
|
|
629
|
-
)
|
|
630
|
-
else:
|
|
631
|
-
from fastapi import HTTPException
|
|
632
|
-
|
|
633
|
-
raise HTTPException(
|
|
634
|
-
status_code=400,
|
|
635
|
-
detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
|
|
636
|
-
)
|
|
637
|
-
|
|
638
|
-
@router.get("/chat/htmx/feedback-download/{agent_name}/{format}", response_class=FileResponse, include_in_schema=False)
|
|
639
|
-
async def chat_feedback_download(
|
|
640
|
-
request: Request,
|
|
641
|
-
agent_name: str,
|
|
642
|
-
format: Literal["csv", "xlsx"] = "csv",
|
|
643
|
-
store: SharedLinkStoreInterface = Depends(get_shared_link_store)
|
|
644
|
-
):
|
|
645
|
-
"""Download all feedback records for a specific agent as a File."""
|
|
646
|
-
if format == "csv":
|
|
647
|
-
return await create_csv_feedback_file_for_agent(
|
|
648
|
-
request=request,
|
|
649
|
-
store=store,
|
|
650
|
-
separator=",",
|
|
651
|
-
agent_name=agent_name,
|
|
652
|
-
)
|
|
653
|
-
elif format == "xlsx":
|
|
654
|
-
return await create_xlsx_feedback_file_for_agent(
|
|
655
|
-
request=request,
|
|
656
|
-
store=store,
|
|
657
|
-
agent_name=agent_name,
|
|
658
|
-
)
|
|
659
|
-
else:
|
|
660
|
-
from fastapi import HTTPException
|
|
661
|
-
|
|
662
|
-
raise HTTPException(
|
|
663
|
-
status_code=400,
|
|
664
|
-
detail="Invalid file-format specified. Valid formats are: 'csv', 'xlsx'"
|
|
665
|
-
)
|