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/core/util/splitter.py
DELETED
|
@@ -1,219 +0,0 @@
|
|
|
1
|
-
import re
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
def split_top_level(spec: str) -> list[str]:
|
|
5
|
-
"""Return raw field strings, split on *top-level* commas."""
|
|
6
|
-
fields: list[str] = []
|
|
7
|
-
start = 0
|
|
8
|
-
depth = 0
|
|
9
|
-
quote_char: str | None = None
|
|
10
|
-
i = 0
|
|
11
|
-
ident_re = re.compile(r"[A-Za-z_]\w*") # cheap identifier
|
|
12
|
-
|
|
13
|
-
while i < len(spec):
|
|
14
|
-
ch = spec[i]
|
|
15
|
-
|
|
16
|
-
# ---------- string handling ----------
|
|
17
|
-
if quote_char:
|
|
18
|
-
if ch == "\\":
|
|
19
|
-
i += 2 # skip escaped char
|
|
20
|
-
continue
|
|
21
|
-
if ch == quote_char:
|
|
22
|
-
quote_char = None
|
|
23
|
-
i += 1
|
|
24
|
-
continue
|
|
25
|
-
|
|
26
|
-
if ch in {"'", '"'}:
|
|
27
|
-
prev = spec[i - 1] if i else " "
|
|
28
|
-
if (
|
|
29
|
-
depth or prev.isspace() or prev in "=([{,:"
|
|
30
|
-
): # looks like a quote
|
|
31
|
-
quote_char = ch
|
|
32
|
-
i += 1
|
|
33
|
-
continue
|
|
34
|
-
|
|
35
|
-
# ---------- bracket / brace / paren ----------
|
|
36
|
-
if ch in "([{":
|
|
37
|
-
depth += 1
|
|
38
|
-
i += 1
|
|
39
|
-
continue
|
|
40
|
-
if ch in ")]}":
|
|
41
|
-
depth = max(depth - 1, 0)
|
|
42
|
-
i += 1
|
|
43
|
-
continue
|
|
44
|
-
|
|
45
|
-
# ---------- field separators ----------
|
|
46
|
-
if ch == "," and depth == 0:
|
|
47
|
-
j = i + 1
|
|
48
|
-
while j < len(spec) and spec[j].isspace():
|
|
49
|
-
j += 1
|
|
50
|
-
if j >= len(spec): # comma at end – split
|
|
51
|
-
fields.append(spec[start:i].strip())
|
|
52
|
-
start = i + 1
|
|
53
|
-
i += 1
|
|
54
|
-
continue
|
|
55
|
-
|
|
56
|
-
id_match = ident_re.match(spec, j)
|
|
57
|
-
if id_match:
|
|
58
|
-
k = id_match.end()
|
|
59
|
-
while k < len(spec) and spec[k].isspace():
|
|
60
|
-
k += 1
|
|
61
|
-
if k >= len(spec) or spec[k] in {":", "|", ","}:
|
|
62
|
-
# confirmed: comma separates two fields
|
|
63
|
-
fields.append(spec[start:i].strip())
|
|
64
|
-
start = i + 1
|
|
65
|
-
i += 1
|
|
66
|
-
continue
|
|
67
|
-
|
|
68
|
-
i += 1
|
|
69
|
-
|
|
70
|
-
fields.append(spec[start:].strip())
|
|
71
|
-
return [f for f in fields if f] # prune empties
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
def parse_schema(spec: str) -> list[tuple[str, str, str]]:
|
|
75
|
-
"""Turn *spec* into a list of (name, python_type, description)."""
|
|
76
|
-
result: list[tuple[str, str, str]] = []
|
|
77
|
-
|
|
78
|
-
for field in split_top_level(spec):
|
|
79
|
-
name = ""
|
|
80
|
-
type_str = "str" # default type
|
|
81
|
-
description = ""
|
|
82
|
-
|
|
83
|
-
name_part, _, desc_part = field.partition("|")
|
|
84
|
-
description = desc_part.strip()
|
|
85
|
-
main_part = name_part.strip()
|
|
86
|
-
|
|
87
|
-
if ":" in main_part:
|
|
88
|
-
name, type_candidate = main_part.split(":", 1)
|
|
89
|
-
name = name.strip()
|
|
90
|
-
type_candidate = type_candidate.strip()
|
|
91
|
-
if type_candidate:
|
|
92
|
-
type_str = type_candidate
|
|
93
|
-
else:
|
|
94
|
-
name = main_part # keeps default type
|
|
95
|
-
|
|
96
|
-
if name: # skip broken pieces
|
|
97
|
-
result.append((name, type_str, description))
|
|
98
|
-
|
|
99
|
-
return result
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
# ------------------------------ demo ------------------------------
|
|
103
|
-
if __name__ == "__main__":
|
|
104
|
-
SAMPLE_1 = (
|
|
105
|
-
" name: str | The character's full name,"
|
|
106
|
-
"race: str | The character's fantasy race,"
|
|
107
|
-
"class: Literal['mage','thief'] | The character's profession,"
|
|
108
|
-
"background: str | A brief backstory for the character"
|
|
109
|
-
)
|
|
110
|
-
|
|
111
|
-
SAMPLE_2 = (
|
|
112
|
-
"field_with_internal_quotes: Literal['type_A', "
|
|
113
|
-
'"type_B_with_\'_apostrophe"] | A literal with mixed quotes,'
|
|
114
|
-
" another_field :str| A field with a description"
|
|
115
|
-
)
|
|
116
|
-
|
|
117
|
-
SAMPLE_3 = (
|
|
118
|
-
"field_with_internal_quotes: Literal['type_A', "
|
|
119
|
-
'"type_B_with_\'_apostrophe"] | A literal with mixed quotes,'
|
|
120
|
-
" another_field | A field with a description"
|
|
121
|
-
)
|
|
122
|
-
|
|
123
|
-
SAMPLE_4 = "input, query, output"
|
|
124
|
-
|
|
125
|
-
SAMPLE_5 = (
|
|
126
|
-
"name: str | The character's full name,"
|
|
127
|
-
"race: str | The character's fantasy race,"
|
|
128
|
-
"class: Literal['mage','thief'] | The character's profession, which can be either mage or thief,"
|
|
129
|
-
"background: str | A brief backstory for the character"
|
|
130
|
-
)
|
|
131
|
-
|
|
132
|
-
SAMPLE_6 = (
|
|
133
|
-
"summary: str | A short blurb, e.g. key:value pairs that appear in logs"
|
|
134
|
-
)
|
|
135
|
-
# ➜ [('summary', 'str',
|
|
136
|
-
# 'A short blurb, e.g. key:value pairs that appear in logs')]
|
|
137
|
-
|
|
138
|
-
SAMPLE_7 = "path: str | The literal string 'C:\\\\Program Files\\\\My,App'"
|
|
139
|
-
|
|
140
|
-
# ➜ [('path', 'str',
|
|
141
|
-
# "The literal string 'C:\\Program Files\\My,App'")]
|
|
142
|
-
|
|
143
|
-
SAMPLE_8 = (
|
|
144
|
-
"transform: Callable[[int, str], bool] | Function that returns True on success,"
|
|
145
|
-
"retries: int | How many times to retry"
|
|
146
|
-
)
|
|
147
|
-
# ➜ ('transform', 'Callable[[int, str], bool]', 'Function that returns True on success')
|
|
148
|
-
# ('retries', 'int', 'How many times to retry')
|
|
149
|
-
|
|
150
|
-
SAMPLE_9 = (
|
|
151
|
-
r"regex: str | Pattern such as r'^[A-Z\|a-z]+$',"
|
|
152
|
-
"flags: int | re flags to use"
|
|
153
|
-
)
|
|
154
|
-
# ➜ ('regex', 'str', "Pattern such as r'^[A-Z\\|a-z]+$'")
|
|
155
|
-
# ('flags', 'int', 're flags to use')
|
|
156
|
-
|
|
157
|
-
SAMPLE_10 = "id:int, name:str," # note the final comma!
|
|
158
|
-
# ➜ ('id', 'int', '')
|
|
159
|
-
# ('name', 'str', '')
|
|
160
|
-
|
|
161
|
-
SAMPLE_11 = "id:int | Primary key\nname:str | Display name\nactive:bool"
|
|
162
|
-
# ➜ should not work!
|
|
163
|
-
|
|
164
|
-
SAMPLE_12 = (
|
|
165
|
-
'comment:str | The text "done | failed" goes here,'
|
|
166
|
-
'status:Literal["done","failed"]'
|
|
167
|
-
)
|
|
168
|
-
# ➜ ('comment', 'str', 'The text "done | failed" goes here')
|
|
169
|
-
# ('status', 'Literal["done","failed"]', '')
|
|
170
|
-
|
|
171
|
-
SAMPLE_13 = "choice: Literal['He said \\'yes\\'', 'no'] | User response"
|
|
172
|
-
# ➜ ('choice', "Literal['He said \\'yes\\'', 'no']", 'User response')
|
|
173
|
-
|
|
174
|
-
SAMPLE_14 = ""
|
|
175
|
-
# ➜ []
|
|
176
|
-
|
|
177
|
-
SAMPLE_15 = "username"
|
|
178
|
-
# ➜ [('username', 'str', '')]
|
|
179
|
-
|
|
180
|
-
SAMPLE_16 = (
|
|
181
|
-
"payload: dict[str, list[dict[str, tuple[int,str]]]] "
|
|
182
|
-
"| Arbitrarily complex structure"
|
|
183
|
-
)
|
|
184
|
-
# ➜ ('payload', 'dict[str, list[dict[str, tuple[int,str]]]]',
|
|
185
|
-
# 'Arbitrarily complex structure')
|
|
186
|
-
|
|
187
|
-
SAMPLE_17 = "münze: str | Deutsche Münzbezeichnung, engl. 'coin'"
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
SAMPLE_18 = "ticket_info : str, reasoning : str, search_queries : list[str], relevant_documents: dict[str, float] | dict of pdf_ids as keys and scores as values"
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
SAMPLE_19 = "title, headings: list[str], entities_and_metadata: list[dict[str, str]], type:Literal['news', 'blog', 'opinion piece', 'tweet']"
|
|
194
|
-
# ➜ [('münze', 'str', "Deutsche Münzbezeichnung, engl. 'coin'")]
|
|
195
|
-
|
|
196
|
-
for title, spec in [
|
|
197
|
-
("Sample-1", SAMPLE_1),
|
|
198
|
-
("Sample-2", SAMPLE_2),
|
|
199
|
-
("Sample-3", SAMPLE_3),
|
|
200
|
-
("Sample-4", SAMPLE_4),
|
|
201
|
-
("Sample-5", SAMPLE_5),
|
|
202
|
-
("Sample-6", SAMPLE_6),
|
|
203
|
-
("Sample-7", SAMPLE_7),
|
|
204
|
-
("Sample-8", SAMPLE_8),
|
|
205
|
-
("Sample-9", SAMPLE_9),
|
|
206
|
-
("Sample-10", SAMPLE_10),
|
|
207
|
-
("Sample-11", SAMPLE_11),
|
|
208
|
-
("Sample-12", SAMPLE_12),
|
|
209
|
-
("Sample-13", SAMPLE_13),
|
|
210
|
-
("Sample-14", SAMPLE_14),
|
|
211
|
-
("Sample-15", SAMPLE_15),
|
|
212
|
-
("Sample-16", SAMPLE_16),
|
|
213
|
-
("Sample-17", SAMPLE_17),
|
|
214
|
-
("Sample-18", SAMPLE_18),
|
|
215
|
-
("Sample-19", SAMPLE_19),
|
|
216
|
-
]:
|
|
217
|
-
print(f"\n{title}")
|
|
218
|
-
for row in parse_schema(spec):
|
|
219
|
-
print(row)
|
flock/di.py
DELETED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
"""Flock - Dependency-Injection helpers.
|
|
2
|
-
|
|
3
|
-
This module provides a small facade over `wd.di` so other parts of the
|
|
4
|
-
codebase do not need to know where the active container is stored.
|
|
5
|
-
"""
|
|
6
|
-
|
|
7
|
-
from __future__ import annotations
|
|
8
|
-
|
|
9
|
-
from typing import TYPE_CHECKING
|
|
10
|
-
|
|
11
|
-
if TYPE_CHECKING: # pragma: no cover
|
|
12
|
-
from wd.di.container import (
|
|
13
|
-
ServiceProvider, # noqa: F401 - import only for typing
|
|
14
|
-
)
|
|
15
|
-
|
|
16
|
-
from flock.core.context.context import FlockContext
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
def get_current_container(context: FlockContext | None = None):
|
|
20
|
-
"""Return the active `wd.di` container from *context* if present.
|
|
21
|
-
|
|
22
|
-
If *context* is ``None`` or no container has been attached to it the
|
|
23
|
-
function returns ``None``.
|
|
24
|
-
"""
|
|
25
|
-
if context is None:
|
|
26
|
-
return None
|
|
27
|
-
return context.get_variable("di.container")
|
flock/platform/docker_tools.py
DELETED
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
import asyncio
|
|
2
|
-
import subprocess
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
def _check_docker_running():
|
|
6
|
-
"""Check if Docker is running by calling 'docker info'."""
|
|
7
|
-
try:
|
|
8
|
-
result = subprocess.run(
|
|
9
|
-
["docker", "info"],
|
|
10
|
-
stdout=subprocess.PIPE,
|
|
11
|
-
stderr=subprocess.PIPE,
|
|
12
|
-
text=True,
|
|
13
|
-
)
|
|
14
|
-
return result.returncode == 0
|
|
15
|
-
except Exception:
|
|
16
|
-
return False
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
async def _start_docker():
|
|
20
|
-
"""Attempt to start Docker.
|
|
21
|
-
This example first tries 'systemctl start docker' and then 'service docker start'.
|
|
22
|
-
Adjust as needed for your environment.
|
|
23
|
-
"""
|
|
24
|
-
try:
|
|
25
|
-
print("Attempting to start Docker...")
|
|
26
|
-
result = subprocess.run(
|
|
27
|
-
["sudo", "systemctl", "start", "docker"],
|
|
28
|
-
stdout=subprocess.PIPE,
|
|
29
|
-
stderr=subprocess.PIPE,
|
|
30
|
-
text=True,
|
|
31
|
-
)
|
|
32
|
-
if result.returncode != 0:
|
|
33
|
-
result = subprocess.run(
|
|
34
|
-
["sudo", "service", "docker", "start"],
|
|
35
|
-
stdout=subprocess.PIPE,
|
|
36
|
-
stderr=subprocess.PIPE,
|
|
37
|
-
text=True,
|
|
38
|
-
)
|
|
39
|
-
# Give Docker a moment to start.
|
|
40
|
-
await asyncio.sleep(3)
|
|
41
|
-
if _check_docker_running():
|
|
42
|
-
print("Docker is now running.")
|
|
43
|
-
return True
|
|
44
|
-
else:
|
|
45
|
-
print("Docker did not start successfully.")
|
|
46
|
-
return False
|
|
47
|
-
except Exception as e:
|
|
48
|
-
print(f"Exception when trying to start Docker: {e}")
|
|
49
|
-
return False
|
flock/platform/jaeger_install.py
DELETED
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
import socket
|
|
2
|
-
import subprocess
|
|
3
|
-
from urllib.parse import urlparse
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
class JaegerInstaller:
|
|
7
|
-
jaeger_endpoint: str = None
|
|
8
|
-
jaeger_transport: str = "grpc"
|
|
9
|
-
|
|
10
|
-
def _check_jaeger_running(self):
|
|
11
|
-
"""Check if Jaeger is reachable by attempting a socket connection.
|
|
12
|
-
For HTTP transport, we parse the URL; for gRPC, we expect "host:port".
|
|
13
|
-
"""
|
|
14
|
-
try:
|
|
15
|
-
if self.jaeger_transport == "grpc":
|
|
16
|
-
host, port = self.jaeger_endpoint.split(":")
|
|
17
|
-
port = int(port)
|
|
18
|
-
elif self.jaeger_transport == "http":
|
|
19
|
-
parsed = urlparse(self.jaeger_endpoint)
|
|
20
|
-
host = parsed.hostname
|
|
21
|
-
port = parsed.port if parsed.port else 80
|
|
22
|
-
else:
|
|
23
|
-
return False
|
|
24
|
-
|
|
25
|
-
# Try connecting to the host and port.
|
|
26
|
-
with socket.create_connection((host, port), timeout=3):
|
|
27
|
-
return True
|
|
28
|
-
except Exception:
|
|
29
|
-
return False
|
|
30
|
-
|
|
31
|
-
def _is_jaeger_container_running(self):
|
|
32
|
-
"""Check if a Jaeger container (using the official all-in-one image) is running.
|
|
33
|
-
This uses 'docker ps' to filter for containers running the Jaeger image.
|
|
34
|
-
"""
|
|
35
|
-
try:
|
|
36
|
-
result = subprocess.run(
|
|
37
|
-
[
|
|
38
|
-
"docker",
|
|
39
|
-
"ps",
|
|
40
|
-
"--filter",
|
|
41
|
-
"ancestor=jaegertracing/all-in-one:latest",
|
|
42
|
-
"--format",
|
|
43
|
-
"{{.ID}}",
|
|
44
|
-
],
|
|
45
|
-
stdout=subprocess.PIPE,
|
|
46
|
-
stderr=subprocess.PIPE,
|
|
47
|
-
text=True,
|
|
48
|
-
)
|
|
49
|
-
return bool(result.stdout.strip())
|
|
50
|
-
except Exception:
|
|
51
|
-
return False
|
|
52
|
-
|
|
53
|
-
def _provision_jaeger_container(self):
|
|
54
|
-
"""Provision a Jaeger container using Docker."""
|
|
55
|
-
try:
|
|
56
|
-
print("Provisioning Jaeger container using Docker...")
|
|
57
|
-
result = subprocess.run(
|
|
58
|
-
[
|
|
59
|
-
"docker",
|
|
60
|
-
"run",
|
|
61
|
-
"-d",
|
|
62
|
-
"--name",
|
|
63
|
-
"jaeger",
|
|
64
|
-
"-p",
|
|
65
|
-
"16686:16686",
|
|
66
|
-
"-p",
|
|
67
|
-
"14250:14250",
|
|
68
|
-
"-p",
|
|
69
|
-
"14268:14268",
|
|
70
|
-
"jaegertracing/all-in-one:latest",
|
|
71
|
-
],
|
|
72
|
-
stdout=subprocess.PIPE,
|
|
73
|
-
stderr=subprocess.PIPE,
|
|
74
|
-
text=True,
|
|
75
|
-
)
|
|
76
|
-
if result.returncode == 0:
|
|
77
|
-
print("Jaeger container started successfully.")
|
|
78
|
-
return True
|
|
79
|
-
else:
|
|
80
|
-
print(
|
|
81
|
-
f"Failed to start Jaeger container. Error: {result.stderr}"
|
|
82
|
-
)
|
|
83
|
-
return False
|
|
84
|
-
except Exception as e:
|
|
85
|
-
print(f"Exception when provisioning Jaeger container: {e}")
|
|
86
|
-
return False
|
flock/webapp/__init__.py
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
"""Flock Web Application Package."""
|
flock/webapp/app/__init__.py
DELETED
|
File without changes
|
flock/webapp/app/api/__init__.py
DELETED
|
File without changes
|
|
@@ -1,241 +0,0 @@
|
|
|
1
|
-
# src/flock/webapp/app/api/agent_management.py
|
|
2
|
-
import json
|
|
3
|
-
from pathlib import Path
|
|
4
|
-
from typing import TYPE_CHECKING
|
|
5
|
-
|
|
6
|
-
from fastapi import ( # Added Depends and HTTPException
|
|
7
|
-
APIRouter,
|
|
8
|
-
Depends,
|
|
9
|
-
Form,
|
|
10
|
-
Request,
|
|
11
|
-
)
|
|
12
|
-
from fastapi.responses import HTMLResponse
|
|
13
|
-
from fastapi.templating import Jinja2Templates
|
|
14
|
-
|
|
15
|
-
if TYPE_CHECKING:
|
|
16
|
-
from flock.core.flock import Flock
|
|
17
|
-
|
|
18
|
-
# Import the dependency to get the current Flock instance
|
|
19
|
-
from flock.webapp.app.dependencies import (
|
|
20
|
-
get_flock_instance,
|
|
21
|
-
get_optional_flock_instance,
|
|
22
|
-
)
|
|
23
|
-
|
|
24
|
-
# Import service functions that now take app_state (or directly the Flock instance)
|
|
25
|
-
from flock.webapp.app.services.flock_service import (
|
|
26
|
-
add_agent_to_current_flock_service,
|
|
27
|
-
get_registered_items_service, # This is fine as it doesn't depend on current_flock
|
|
28
|
-
remove_agent_from_current_flock_service,
|
|
29
|
-
update_agent_in_current_flock_service,
|
|
30
|
-
)
|
|
31
|
-
|
|
32
|
-
router = APIRouter()
|
|
33
|
-
BASE_DIR = Path(__file__).resolve().parent.parent.parent # Points to flock-ui/
|
|
34
|
-
templates = Jinja2Templates(directory=str(BASE_DIR / "templates"))
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
@router.get("/htmx/agent-list", response_class=HTMLResponse)
|
|
38
|
-
async def htmx_get_agent_list(
|
|
39
|
-
request: Request,
|
|
40
|
-
message: str = None,
|
|
41
|
-
success: bool = None,
|
|
42
|
-
# Use Depends to get the current flock instance.
|
|
43
|
-
# Use get_optional_flock_instance if the route should work even without a flock loaded.
|
|
44
|
-
current_flock: "Flock | None" = Depends(get_optional_flock_instance)
|
|
45
|
-
):
|
|
46
|
-
if not current_flock:
|
|
47
|
-
# If used in a context where flock might not be loaded (e.g. main agent manager view before load)
|
|
48
|
-
# it should be handled by the page template or a higher-level redirect.
|
|
49
|
-
# For a partial, returning an error or empty state is reasonable.
|
|
50
|
-
return HTMLResponse("<div id='agent-list-container'><p class='error'>No Flock loaded to display agents.</p></div>", headers={"HX-Retarget": "#agent-list-container", "HX-Reswap": "innerHTML"})
|
|
51
|
-
|
|
52
|
-
return templates.TemplateResponse(
|
|
53
|
-
"partials/_agent_list.html",
|
|
54
|
-
{
|
|
55
|
-
"request": request,
|
|
56
|
-
"flock": current_flock, # Pass the injected flock instance
|
|
57
|
-
"message": message,
|
|
58
|
-
"success": success,
|
|
59
|
-
},
|
|
60
|
-
)
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
@router.get("/htmx/agents/{agent_name}/details-form", response_class=HTMLResponse)
|
|
64
|
-
async def htmx_get_agent_details_form(
|
|
65
|
-
request: Request,
|
|
66
|
-
agent_name: str,
|
|
67
|
-
current_flock: "Flock" = Depends(get_flock_instance) # Expect flock to be loaded
|
|
68
|
-
):
|
|
69
|
-
# flock instance is now injected by FastAPI
|
|
70
|
-
agent = current_flock.agents.get(agent_name)
|
|
71
|
-
if not agent:
|
|
72
|
-
return HTMLResponse(
|
|
73
|
-
f"<p class='error'>Agent '{agent_name}' not found in the current Flock.</p>"
|
|
74
|
-
)
|
|
75
|
-
|
|
76
|
-
registered_tools = get_registered_items_service("tool")
|
|
77
|
-
current_agent_tools = (
|
|
78
|
-
[tool.__name__ for tool in agent.tools] if agent.tools else []
|
|
79
|
-
)
|
|
80
|
-
|
|
81
|
-
return templates.TemplateResponse(
|
|
82
|
-
"partials/_agent_detail_form.html",
|
|
83
|
-
{
|
|
84
|
-
"request": request,
|
|
85
|
-
"agent": agent,
|
|
86
|
-
"is_new": False,
|
|
87
|
-
"registered_tools": registered_tools,
|
|
88
|
-
"current_tools": current_agent_tools,
|
|
89
|
-
},
|
|
90
|
-
)
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
@router.get("/htmx/agents/new-agent-form", response_class=HTMLResponse)
|
|
94
|
-
async def htmx_get_new_agent_form(
|
|
95
|
-
request: Request,
|
|
96
|
-
current_flock: "Flock" = Depends(get_flock_instance) # Expect flock for context, even for new agent
|
|
97
|
-
):
|
|
98
|
-
# current_flock is injected, primarily to ensure context if needed by template/tools list
|
|
99
|
-
registered_tools = get_registered_items_service("tool")
|
|
100
|
-
return templates.TemplateResponse(
|
|
101
|
-
"partials/_agent_detail_form.html",
|
|
102
|
-
{
|
|
103
|
-
"request": request,
|
|
104
|
-
"agent": None,
|
|
105
|
-
"is_new": True,
|
|
106
|
-
"registered_tools": registered_tools,
|
|
107
|
-
"current_tools": [],
|
|
108
|
-
},
|
|
109
|
-
)
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
@router.post("/htmx/agents", response_class=HTMLResponse)
|
|
113
|
-
async def htmx_create_agent(
|
|
114
|
-
request: Request,
|
|
115
|
-
agent_name: str = Form(...),
|
|
116
|
-
agent_description: str = Form(""),
|
|
117
|
-
agent_model: str = Form(None),
|
|
118
|
-
input_signature: str = Form(...),
|
|
119
|
-
output_signature: str = Form(...),
|
|
120
|
-
tools: list[str] = Form([]),
|
|
121
|
-
# current_flock: Flock = Depends(get_flock_instance) # Service will use app_state
|
|
122
|
-
):
|
|
123
|
-
# The service function add_agent_to_current_flock_service now takes app_state
|
|
124
|
-
if (not agent_name.strip() or not input_signature.strip() or not output_signature.strip()):
|
|
125
|
-
registered_tools = get_registered_items_service("tool")
|
|
126
|
-
return templates.TemplateResponse(
|
|
127
|
-
"partials/_agent_detail_form.html",
|
|
128
|
-
{
|
|
129
|
-
"request": request, "agent": None, "is_new": True,
|
|
130
|
-
"error_message": "Name, Input Signature, and Output Signature are required.",
|
|
131
|
-
"registered_tools": registered_tools, "current_tools": tools,
|
|
132
|
-
})
|
|
133
|
-
|
|
134
|
-
agent_config = {
|
|
135
|
-
"name": agent_name, "description": agent_description,
|
|
136
|
-
"model": agent_model if agent_model and agent_model.strip() else None,
|
|
137
|
-
"input": input_signature, "output": output_signature, "tools_names": tools,
|
|
138
|
-
}
|
|
139
|
-
# Pass request.app.state to the service function
|
|
140
|
-
success = add_agent_to_current_flock_service(agent_config, request.app.state)
|
|
141
|
-
|
|
142
|
-
response_headers = {}
|
|
143
|
-
if success:
|
|
144
|
-
response_headers["HX-Trigger"] = json.dumps({"agentListChanged": None, "notify": {"type":"success", "message": f"Agent '{agent_name}' created."}})
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
# Re-render the form or an empty state for the detail panel
|
|
148
|
-
# The agent list itself will be refreshed by the agentListChanged trigger
|
|
149
|
-
new_form_context = {
|
|
150
|
-
"request": request, "agent": None, "is_new": True,
|
|
151
|
-
"registered_tools": get_registered_items_service("tool"),
|
|
152
|
-
"current_tools": [], # Reset tools for new form
|
|
153
|
-
"form_message": "Agent created successfully!" if success else "Failed to create agent. Check logs.",
|
|
154
|
-
"success": success,
|
|
155
|
-
}
|
|
156
|
-
return templates.TemplateResponse("partials/_agent_detail_form.html", new_form_context, headers=response_headers)
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
@router.put("/htmx/agents/{original_agent_name}", response_class=HTMLResponse)
|
|
160
|
-
async def htmx_update_agent(
|
|
161
|
-
request: Request,
|
|
162
|
-
original_agent_name: str,
|
|
163
|
-
agent_name: str = Form(...),
|
|
164
|
-
agent_description: str = Form(""),
|
|
165
|
-
agent_model: str = Form(None),
|
|
166
|
-
input_signature: str = Form(...),
|
|
167
|
-
output_signature: str = Form(...),
|
|
168
|
-
tools: list[str] = Form([]),
|
|
169
|
-
# current_flock: Flock = Depends(get_flock_instance) # Service will use app_state
|
|
170
|
-
):
|
|
171
|
-
agent_config = {
|
|
172
|
-
"name": agent_name, "description": agent_description,
|
|
173
|
-
"model": agent_model if agent_model and agent_model.strip() else None,
|
|
174
|
-
"input": input_signature, "output": output_signature, "tools_names": tools,
|
|
175
|
-
}
|
|
176
|
-
# Pass request.app.state
|
|
177
|
-
success = update_agent_in_current_flock_service(original_agent_name, agent_config, request.app.state)
|
|
178
|
-
|
|
179
|
-
response_headers = {}
|
|
180
|
-
if success:
|
|
181
|
-
response_headers["HX-Trigger"] = json.dumps({"agentListChanged": None, "notify": {"type":"success", "message": f"Agent '{agent_name}' updated."}})
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
# After update, get the (potentially renamed) agent from app.state's flock
|
|
185
|
-
updated_agent_instance: Flock | None = getattr(request.app.state, 'flock_instance', None)
|
|
186
|
-
updated_agent = updated_agent_instance.agents.get(agent_name) if updated_agent_instance else None
|
|
187
|
-
|
|
188
|
-
registered_tools = get_registered_items_service("tool")
|
|
189
|
-
current_agent_tools = []
|
|
190
|
-
if updated_agent and updated_agent.tools:
|
|
191
|
-
current_agent_tools = [tool.__name__ for tool in updated_agent.tools]
|
|
192
|
-
|
|
193
|
-
updated_form_context = {
|
|
194
|
-
"request": request, "agent": updated_agent, "is_new": False,
|
|
195
|
-
"form_message": "Agent updated successfully!" if success else "Failed to update agent. Check logs.",
|
|
196
|
-
"success": success,
|
|
197
|
-
"registered_tools": registered_tools, "current_tools": current_agent_tools,
|
|
198
|
-
}
|
|
199
|
-
return templates.TemplateResponse("partials/_agent_detail_form.html", updated_form_context, headers=response_headers)
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
@router.delete("/htmx/agents/{agent_name}", response_class=HTMLResponse)
|
|
203
|
-
async def htmx_delete_agent(
|
|
204
|
-
request: Request,
|
|
205
|
-
agent_name: str,
|
|
206
|
-
# current_flock: Flock = Depends(get_flock_instance) # Service will use app_state
|
|
207
|
-
):
|
|
208
|
-
# Pass request.app.state
|
|
209
|
-
success = remove_agent_from_current_flock_service(agent_name, request.app.state)
|
|
210
|
-
response_headers = {}
|
|
211
|
-
|
|
212
|
-
if success:
|
|
213
|
-
response_headers["HX-Trigger"] = json.dumps({"agentListChanged": None, "notify": {"type":"info", "message": f"Agent '{agent_name}' removed."}})
|
|
214
|
-
# Return an empty agent detail form to clear that panel
|
|
215
|
-
empty_form_context = {
|
|
216
|
-
"request": request, "agent": None, "is_new": True,
|
|
217
|
-
"registered_tools": get_registered_items_service("tool"),
|
|
218
|
-
"current_tools": [],
|
|
219
|
-
# "form_message": f"Agent '{agent_name}' removed.", # Message handled by notify
|
|
220
|
-
# "success": True, # Not strictly needed if form is cleared
|
|
221
|
-
}
|
|
222
|
-
return templates.TemplateResponse("partials/_agent_detail_form.html", empty_form_context, headers=response_headers)
|
|
223
|
-
else:
|
|
224
|
-
# Deletion failed, re-render the form for the agent that failed to delete (if it still exists)
|
|
225
|
-
flock_instance_from_state: Flock | None = getattr(request.app.state, 'flock_instance', None)
|
|
226
|
-
agent_still_exists = flock_instance_from_state.agents.get(agent_name) if flock_instance_from_state else None
|
|
227
|
-
|
|
228
|
-
registered_tools = get_registered_items_service("tool")
|
|
229
|
-
current_tools = []
|
|
230
|
-
if agent_still_exists and agent_still_exists.tools:
|
|
231
|
-
current_tools = [tool.__name__ for tool in agent_still_exists.tools]
|
|
232
|
-
|
|
233
|
-
error_form_context = {
|
|
234
|
-
"request": request, "agent": agent_still_exists, "is_new": False,
|
|
235
|
-
"form_message": f"Failed to remove agent '{agent_name}'. It might have already been removed or an error occurred.",
|
|
236
|
-
"success": False,
|
|
237
|
-
"registered_tools": registered_tools, "current_tools": current_tools,
|
|
238
|
-
}
|
|
239
|
-
# Trigger a notification for the error as well
|
|
240
|
-
response_headers["HX-Trigger"] = json.dumps({"notify": {"type":"error", "message": f"Failed to remove agent '{agent_name}'."}})
|
|
241
|
-
return templates.TemplateResponse("partials/_agent_detail_form.html", error_form_context, headers=response_headers)
|