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
|
@@ -1,680 +0,0 @@
|
|
|
1
|
-
"""FlockMCPServer is the core, declarative base class for all types of MCP-Servers in the Flock framework."""
|
|
2
|
-
|
|
3
|
-
import asyncio
|
|
4
|
-
import importlib
|
|
5
|
-
import inspect
|
|
6
|
-
import os
|
|
7
|
-
from abc import ABC, abstractmethod
|
|
8
|
-
from typing import Any, Literal, TypeVar
|
|
9
|
-
|
|
10
|
-
from dspy import Tool as DSPyTool
|
|
11
|
-
from opentelemetry import trace
|
|
12
|
-
from pydantic import (
|
|
13
|
-
BaseModel,
|
|
14
|
-
ConfigDict,
|
|
15
|
-
Field,
|
|
16
|
-
)
|
|
17
|
-
|
|
18
|
-
from flock.core.component.agent_component_base import AgentComponent
|
|
19
|
-
from flock.core.logging.logging import get_logger
|
|
20
|
-
from flock.core.mcp.flock_mcp_tool import FlockMCPTool
|
|
21
|
-
from flock.core.mcp.mcp_client_manager import FlockMCPClientManager
|
|
22
|
-
from flock.core.mcp.mcp_config import FlockMCPConfiguration
|
|
23
|
-
from flock.core.serialization.serializable import Serializable
|
|
24
|
-
from flock.core.serialization.serialization_utils import (
|
|
25
|
-
deserialize_component,
|
|
26
|
-
serialize_item,
|
|
27
|
-
)
|
|
28
|
-
|
|
29
|
-
logger = get_logger("mcp.server")
|
|
30
|
-
tracer = trace.get_tracer(__name__)
|
|
31
|
-
T = TypeVar("T", bound="FlockMCPServer")
|
|
32
|
-
|
|
33
|
-
LoggingLevel = Literal[
|
|
34
|
-
"debug",
|
|
35
|
-
"info",
|
|
36
|
-
"notice",
|
|
37
|
-
"warning",
|
|
38
|
-
"error",
|
|
39
|
-
"critical",
|
|
40
|
-
"alert",
|
|
41
|
-
"emergency",
|
|
42
|
-
]
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
class FlockMCPServer(BaseModel, Serializable, ABC):
|
|
46
|
-
"""Base class for all Flock MCP Server Types.
|
|
47
|
-
|
|
48
|
-
Servers serve as an abstraction-layer between the underlying MCPClientSession
|
|
49
|
-
which is the actual connection between Flock and a (remote) MCP-Server.
|
|
50
|
-
|
|
51
|
-
Servers hook into the lifecycle of their assigned agents and take care
|
|
52
|
-
of establishing sessions, getting and converting tools and other functions
|
|
53
|
-
without agents having to worry about the details.
|
|
54
|
-
|
|
55
|
-
Tools (if provided) will be injected into the list of tools of any attached
|
|
56
|
-
agent automatically.
|
|
57
|
-
|
|
58
|
-
Servers provide lifecycle-hooks (`initialize`, `get_tools`, `get_prompts`, `list_resources`, `get_resource_contents`, `set_roots`, etc)
|
|
59
|
-
which allow modules to hook into them. This can be used to modify data or
|
|
60
|
-
pass headers from authentication-flows to a server.
|
|
61
|
-
|
|
62
|
-
Each Server should define its configuration requirements either by:
|
|
63
|
-
1. Creating a subclass of FlockMCPServerConfig
|
|
64
|
-
2. Using FlockMCPServerConfig.with_fields() to create a config class.
|
|
65
|
-
"""
|
|
66
|
-
|
|
67
|
-
config: FlockMCPConfiguration = Field(
|
|
68
|
-
..., description="Config for clients connecting to the server."
|
|
69
|
-
)
|
|
70
|
-
|
|
71
|
-
initialized: bool = Field(
|
|
72
|
-
default=False,
|
|
73
|
-
exclude=True,
|
|
74
|
-
description="Whether or not this Server has already initialized.",
|
|
75
|
-
)
|
|
76
|
-
|
|
77
|
-
components: dict[str, AgentComponent] = Field(
|
|
78
|
-
default={},
|
|
79
|
-
description="Dictionary of unified agent components attached to this Server.",
|
|
80
|
-
)
|
|
81
|
-
|
|
82
|
-
# --- Underlying ConnectionManager ---
|
|
83
|
-
# (Manages a pool of ClientConnections and does the actual talking to the MCP Server)
|
|
84
|
-
# (Excluded from Serialization)
|
|
85
|
-
client_manager: FlockMCPClientManager | None = Field(
|
|
86
|
-
default=None,
|
|
87
|
-
exclude=True,
|
|
88
|
-
description="Underlying Connection Manager. Handles the actual underlying connections to the server.",
|
|
89
|
-
)
|
|
90
|
-
|
|
91
|
-
condition: asyncio.Condition = Field(
|
|
92
|
-
default_factory=asyncio.Condition,
|
|
93
|
-
exclude=True,
|
|
94
|
-
description="Condition for asynchronous operations.",
|
|
95
|
-
)
|
|
96
|
-
|
|
97
|
-
model_config = ConfigDict(
|
|
98
|
-
arbitrary_types_allowed=True,
|
|
99
|
-
)
|
|
100
|
-
|
|
101
|
-
def add_component(self, component: AgentComponent) -> None:
|
|
102
|
-
"""Add a unified component to this server."""
|
|
103
|
-
if not component.name:
|
|
104
|
-
logger.error("Component must have a name to be added.")
|
|
105
|
-
return
|
|
106
|
-
if self.components and component.name in self.components:
|
|
107
|
-
logger.warning(f"Overwriting existing component: {component.name}")
|
|
108
|
-
|
|
109
|
-
self.components[component.name] = component
|
|
110
|
-
logger.debug(
|
|
111
|
-
f"Added component '{component.name}' to server {self.config.name}"
|
|
112
|
-
)
|
|
113
|
-
return
|
|
114
|
-
|
|
115
|
-
def remove_component(self, component_name: str) -> None:
|
|
116
|
-
"""Remove a component from this server."""
|
|
117
|
-
if component_name in self.components:
|
|
118
|
-
del self.components[component_name]
|
|
119
|
-
logger.debug(
|
|
120
|
-
f"Removed component '{component_name}' from server '{self.config.name}'"
|
|
121
|
-
)
|
|
122
|
-
else:
|
|
123
|
-
logger.warning(
|
|
124
|
-
f"Component '{component_name}' not found on server '{self.config.name}'"
|
|
125
|
-
)
|
|
126
|
-
return
|
|
127
|
-
|
|
128
|
-
def get_component(self, component_name: str) -> AgentComponent | None:
|
|
129
|
-
"""Get a component by name."""
|
|
130
|
-
return self.components.get(component_name)
|
|
131
|
-
|
|
132
|
-
def get_enabled_components(self) -> list[AgentComponent]:
|
|
133
|
-
"""Get a list of currently enabled components attached to this server."""
|
|
134
|
-
return [c for c in self.components.values() if c.config.enabled]
|
|
135
|
-
|
|
136
|
-
@abstractmethod
|
|
137
|
-
async def initialize(self) -> FlockMCPClientManager:
|
|
138
|
-
"""Called when initializing the server."""
|
|
139
|
-
pass
|
|
140
|
-
|
|
141
|
-
async def call_tool(
|
|
142
|
-
self, agent_id: str, run_id: str, name: str, arguments: dict[str, Any]
|
|
143
|
-
) -> Any:
|
|
144
|
-
"""Call a tool via the MCP Protocol on the client's server."""
|
|
145
|
-
with tracer.start_as_current_span("server.call_tool") as span:
|
|
146
|
-
span.set_attribute("agent_id", agent_id)
|
|
147
|
-
span.set_attribute("run_id", run_id)
|
|
148
|
-
span.set_attribute("tool.name", name)
|
|
149
|
-
span.set_attribute("arguments", str(arguments))
|
|
150
|
-
if not self.initialized or not self.client_manager:
|
|
151
|
-
async with self.condition:
|
|
152
|
-
await self.pre_init()
|
|
153
|
-
self.client_manager = await self.initialize()
|
|
154
|
-
self.initialized = True
|
|
155
|
-
await self.post_init()
|
|
156
|
-
if not self.config.allow_all_tools:
|
|
157
|
-
whitelist = self.config.feature_config.tool_whitelist
|
|
158
|
-
if (
|
|
159
|
-
whitelist is not None
|
|
160
|
-
and len(whitelist) > 0
|
|
161
|
-
and name not in whitelist
|
|
162
|
-
):
|
|
163
|
-
return None
|
|
164
|
-
async with self.condition:
|
|
165
|
-
try:
|
|
166
|
-
additional_params: dict[str, Any] = {
|
|
167
|
-
"refresh_client": False,
|
|
168
|
-
"override_headers": False,
|
|
169
|
-
} # initialize the additional params as an empty dict.
|
|
170
|
-
|
|
171
|
-
await self.before_connect(
|
|
172
|
-
additional_params=additional_params
|
|
173
|
-
)
|
|
174
|
-
pre_call_args = {
|
|
175
|
-
"agent_id": agent_id,
|
|
176
|
-
"run_id": run_id,
|
|
177
|
-
"tool_name": name,
|
|
178
|
-
"arguments": arguments,
|
|
179
|
-
}
|
|
180
|
-
pre_call_args.update(additional_params)
|
|
181
|
-
await self.pre_mcp_call(pre_call_args)
|
|
182
|
-
result = await self.client_manager.call_tool(
|
|
183
|
-
agent_id=agent_id,
|
|
184
|
-
run_id=run_id,
|
|
185
|
-
name=name,
|
|
186
|
-
arguments=arguments,
|
|
187
|
-
additional_params=additional_params,
|
|
188
|
-
)
|
|
189
|
-
# re-set addtional-params, just to be sure.
|
|
190
|
-
await self.post_mcp_call(result=result)
|
|
191
|
-
return result
|
|
192
|
-
except Exception as mcp_error:
|
|
193
|
-
logger.error(
|
|
194
|
-
"Error during server.call_tool",
|
|
195
|
-
server=self.config.name,
|
|
196
|
-
error=str(mcp_error),
|
|
197
|
-
)
|
|
198
|
-
span.record_exception(mcp_error)
|
|
199
|
-
return None
|
|
200
|
-
|
|
201
|
-
async def get_tools(self, agent_id: str, run_id: str) -> list[DSPyTool]:
|
|
202
|
-
"""Retrieves a list of available tools from this server."""
|
|
203
|
-
with tracer.start_as_current_span("server.get_tools") as span:
|
|
204
|
-
span.set_attribute("server.name", self.config.name)
|
|
205
|
-
span.set_attribute("agent_id", agent_id)
|
|
206
|
-
span.set_attribute("run_id", run_id)
|
|
207
|
-
if not self.initialized or not self.client_manager:
|
|
208
|
-
async with self.condition:
|
|
209
|
-
await self.pre_init()
|
|
210
|
-
self.client_manager = await self.initialize()
|
|
211
|
-
self.initialized = True
|
|
212
|
-
await self.post_init()
|
|
213
|
-
|
|
214
|
-
async with self.condition:
|
|
215
|
-
try:
|
|
216
|
-
await self.pre_mcp_call()
|
|
217
|
-
additional_params: dict[str, Any] = {}
|
|
218
|
-
additional_params = await self.before_connect(
|
|
219
|
-
additional_params=additional_params
|
|
220
|
-
)
|
|
221
|
-
result: list[
|
|
222
|
-
FlockMCPTool
|
|
223
|
-
] = await self.client_manager.get_tools(
|
|
224
|
-
agent_id=agent_id,
|
|
225
|
-
run_id=run_id,
|
|
226
|
-
additional_params=additional_params,
|
|
227
|
-
)
|
|
228
|
-
# filtering based on whitelist
|
|
229
|
-
if not self.config.allow_all_tools:
|
|
230
|
-
whitelist = self.config.feature_config.tool_whitelist
|
|
231
|
-
filtered_results: list[FlockMCPTool] = []
|
|
232
|
-
for tool in result:
|
|
233
|
-
if tool.name in whitelist:
|
|
234
|
-
filtered_results.append(tool)
|
|
235
|
-
result = filtered_results
|
|
236
|
-
converted_tools = [
|
|
237
|
-
t.as_dspy_tool(server=self) for t in result
|
|
238
|
-
]
|
|
239
|
-
await self.post_mcp_call(result=converted_tools)
|
|
240
|
-
return converted_tools
|
|
241
|
-
except Exception as e:
|
|
242
|
-
logger.error(
|
|
243
|
-
f"Unexpected Exception ocurred while trying to get tools from server '{self.config.name}': {e}"
|
|
244
|
-
)
|
|
245
|
-
await self.on_error(error=e)
|
|
246
|
-
span.record_exception(e)
|
|
247
|
-
return []
|
|
248
|
-
finally:
|
|
249
|
-
self.condition.notify()
|
|
250
|
-
|
|
251
|
-
async def before_connect(
|
|
252
|
-
self, additional_params: dict[str, Any]
|
|
253
|
-
) -> dict[str, Any]:
|
|
254
|
-
"""Run before_connect hooks on modules."""
|
|
255
|
-
logger.debug(
|
|
256
|
-
f"Running before_connect hooks for modules in server '{self.config.name}'."
|
|
257
|
-
)
|
|
258
|
-
with tracer.start_as_current_span("server.before_connect") as span:
|
|
259
|
-
span.set_attribute("server.name", self.config.name)
|
|
260
|
-
try:
|
|
261
|
-
if not additional_params:
|
|
262
|
-
additional_params = {}
|
|
263
|
-
for module in self.get_enabled_components():
|
|
264
|
-
additional_params = await module.on_connect(
|
|
265
|
-
server=self, additional_params=additional_params
|
|
266
|
-
)
|
|
267
|
-
except Exception as module_error:
|
|
268
|
-
logger.error(
|
|
269
|
-
"Error during before_connect",
|
|
270
|
-
server=self.config.name,
|
|
271
|
-
error=str(module_error),
|
|
272
|
-
)
|
|
273
|
-
span.record_exception(module_error)
|
|
274
|
-
return additional_params
|
|
275
|
-
|
|
276
|
-
async def pre_init(self) -> None:
|
|
277
|
-
"""Run pre-init hooks on modules."""
|
|
278
|
-
logger.debug(
|
|
279
|
-
f"Running pre-init hooks for modules in server '{self.config.name}'"
|
|
280
|
-
)
|
|
281
|
-
with tracer.start_as_current_span("server.pre_init") as span:
|
|
282
|
-
span.set_attribute("server.name", self.config.name)
|
|
283
|
-
# run whitelist checks
|
|
284
|
-
feature_config = self.config.feature_config
|
|
285
|
-
whitelist = (
|
|
286
|
-
feature_config.tool_whitelist if feature_config else None
|
|
287
|
-
)
|
|
288
|
-
if whitelist:
|
|
289
|
-
# Enforce whitelist usage by disabling blanket tool access
|
|
290
|
-
self.config.allow_all_tools = False
|
|
291
|
-
elif whitelist is None:
|
|
292
|
-
# No whitelist configured; ensure defaults allow full access
|
|
293
|
-
self.config.allow_all_tools = True
|
|
294
|
-
try:
|
|
295
|
-
for module in self.get_enabled_components():
|
|
296
|
-
await module.on_pre_server_init(self)
|
|
297
|
-
except Exception as module_error:
|
|
298
|
-
logger.error(
|
|
299
|
-
"Error during pre_init",
|
|
300
|
-
server=self.config.name,
|
|
301
|
-
error=str(module_error),
|
|
302
|
-
)
|
|
303
|
-
span.record_exception(module_error)
|
|
304
|
-
|
|
305
|
-
async def post_init(self) -> None:
|
|
306
|
-
"""Run post-init hooks on modules."""
|
|
307
|
-
logger.debug(
|
|
308
|
-
f"Running post_init hooks for modules in server '{self.config.name}'"
|
|
309
|
-
)
|
|
310
|
-
with tracer.start_as_current_span("server.post_init") as span:
|
|
311
|
-
span.set_attribute("server.name", self.config.name)
|
|
312
|
-
try:
|
|
313
|
-
for module in self.get_enabled_components():
|
|
314
|
-
await module.on_post_server_init(self)
|
|
315
|
-
except Exception as module_error:
|
|
316
|
-
logger.error(
|
|
317
|
-
"Error during post_init",
|
|
318
|
-
server=self.config.name,
|
|
319
|
-
error=str(module_error),
|
|
320
|
-
)
|
|
321
|
-
span.record_exception(module_error)
|
|
322
|
-
|
|
323
|
-
async def pre_terminate(self) -> None:
|
|
324
|
-
"""Run pre-terminate hooks on modules."""
|
|
325
|
-
logger.debug(
|
|
326
|
-
f"Running post_init hooks for modules in server: '{self.config.name}'"
|
|
327
|
-
)
|
|
328
|
-
with tracer.start_as_current_span("server.pre_terminate") as span:
|
|
329
|
-
span.set_attribute("server.name", self.config.name)
|
|
330
|
-
try:
|
|
331
|
-
for module in self.get_enabled_components():
|
|
332
|
-
await module.on_pre_server_terminate(self)
|
|
333
|
-
except Exception as module_error:
|
|
334
|
-
logger.error(
|
|
335
|
-
"Error during pre_terminate",
|
|
336
|
-
server=self.config.name,
|
|
337
|
-
error=str(module_error),
|
|
338
|
-
)
|
|
339
|
-
span.record_exception(module_error)
|
|
340
|
-
|
|
341
|
-
async def post_terminate(self) -> None:
|
|
342
|
-
"""Run post-terminate hooks on modules."""
|
|
343
|
-
logger.debug(
|
|
344
|
-
f"Running post_terminate hooks for modules in server: '{self.config.name}'"
|
|
345
|
-
)
|
|
346
|
-
with tracer.start_as_current_span("server.post_terminate") as span:
|
|
347
|
-
span.set_attribute("server.name", self.config.name)
|
|
348
|
-
try:
|
|
349
|
-
for module in self.get_enabled_components():
|
|
350
|
-
await module.on_post_server_terminate(server=self)
|
|
351
|
-
except Exception as module_error:
|
|
352
|
-
logger.error(
|
|
353
|
-
"Error during post_terminate",
|
|
354
|
-
server=self.config.name,
|
|
355
|
-
error=str(module_error),
|
|
356
|
-
)
|
|
357
|
-
span.record_exception(module_error)
|
|
358
|
-
|
|
359
|
-
async def on_error(self, error: Exception) -> None:
|
|
360
|
-
"""Run on_error hooks on modules."""
|
|
361
|
-
logger.debug(
|
|
362
|
-
f"Running on_error hooks for modules in server '{self.config.name}'"
|
|
363
|
-
)
|
|
364
|
-
with tracer.start_as_current_span("server.on_error") as span:
|
|
365
|
-
span.set_attribute("server.name", self.config.name)
|
|
366
|
-
try:
|
|
367
|
-
for module in self.get_enabled_components():
|
|
368
|
-
await module.on_server_error(server=self, error=error)
|
|
369
|
-
except Exception as module_error:
|
|
370
|
-
logger.error(
|
|
371
|
-
"Error during on_error",
|
|
372
|
-
server=self.config.name,
|
|
373
|
-
error=str(module_error),
|
|
374
|
-
)
|
|
375
|
-
span.record_exception(module_error)
|
|
376
|
-
|
|
377
|
-
async def pre_mcp_call(self, arguments: Any | None = None) -> None:
|
|
378
|
-
"""Run pre_mcp_call-hooks on modules."""
|
|
379
|
-
logger.debug(
|
|
380
|
-
f"Running pre_mcp_call hooks for modules in server '{self.config.name}'"
|
|
381
|
-
)
|
|
382
|
-
with tracer.start_as_current_span("server.pre_mcp_call") as span:
|
|
383
|
-
span.set_attribute("server.name", self.config.name)
|
|
384
|
-
try:
|
|
385
|
-
for module in self.get_enabled_components():
|
|
386
|
-
await module.on_pre_mcp_call(
|
|
387
|
-
server=self, arguments=arguments
|
|
388
|
-
)
|
|
389
|
-
except Exception as module_error:
|
|
390
|
-
logger.error(
|
|
391
|
-
f"Error during pre_mcp_call: {module_error}",
|
|
392
|
-
server=self.config.name,
|
|
393
|
-
error=str(module_error),
|
|
394
|
-
)
|
|
395
|
-
span.record_exception(module_error)
|
|
396
|
-
|
|
397
|
-
async def post_mcp_call(self, result: Any) -> None:
|
|
398
|
-
"""Run Post MCP_call hooks on modules."""
|
|
399
|
-
logger.debug(
|
|
400
|
-
f"Running post_mcp_call hooks for modules in server '{self.config.name}'"
|
|
401
|
-
)
|
|
402
|
-
with tracer.start_as_current_span("server.post_mcp_call") as span:
|
|
403
|
-
span.set_attribute("server.name", self.config.name)
|
|
404
|
-
try:
|
|
405
|
-
for module in self.get_enabled_components():
|
|
406
|
-
await module.on_post_mcp_call(server=self, result=result)
|
|
407
|
-
except Exception as module_error:
|
|
408
|
-
logger.error(
|
|
409
|
-
"Error during post_mcp_call",
|
|
410
|
-
server=self.config.name,
|
|
411
|
-
error=str(module_error),
|
|
412
|
-
)
|
|
413
|
-
span.record_exception(module_error)
|
|
414
|
-
|
|
415
|
-
# --- Async Methods ---
|
|
416
|
-
async def __aenter__(self) -> "FlockMCPServer":
|
|
417
|
-
"""Enter the asynchronous context for the server."""
|
|
418
|
-
# Spin up the client-manager
|
|
419
|
-
with tracer.start_as_current_span("server.__aenter__") as span:
|
|
420
|
-
span.set_attribute("server.name", self.config.name)
|
|
421
|
-
logger.info(f"server.__aenter__", server=self.config.name)
|
|
422
|
-
try:
|
|
423
|
-
await self.pre_init()
|
|
424
|
-
self.client_manager = await self.initialize()
|
|
425
|
-
await self.post_init()
|
|
426
|
-
self.initialized = True
|
|
427
|
-
except Exception as server_error:
|
|
428
|
-
logger.error(
|
|
429
|
-
f"Error during __aenter__ for server '{self.config.name}'",
|
|
430
|
-
server=self.config.name,
|
|
431
|
-
error=server_error,
|
|
432
|
-
)
|
|
433
|
-
span.record_exception(server_error)
|
|
434
|
-
|
|
435
|
-
async def __aexit__(self, exc_type, exc, tb) -> None:
|
|
436
|
-
"""Exit the asynchronous context for the server."""
|
|
437
|
-
# tell the underlying client-manager to terminate connections
|
|
438
|
-
# and unwind the clients.
|
|
439
|
-
with tracer.start_as_current_span("server.__aexit__") as span:
|
|
440
|
-
span.set_attribute("server.name", self.config.name)
|
|
441
|
-
try:
|
|
442
|
-
await self.pre_terminate()
|
|
443
|
-
if self.initialized and self.client_manager:
|
|
444
|
-
# means we ran through the initialize()-method
|
|
445
|
-
# and the client manager is present
|
|
446
|
-
await self.client_manager.close_all()
|
|
447
|
-
self.client_manager = None
|
|
448
|
-
self.initialized = False
|
|
449
|
-
await self.post_terminate()
|
|
450
|
-
return
|
|
451
|
-
except Exception as server_error:
|
|
452
|
-
logger.error(
|
|
453
|
-
f"Error during __aexit__ for server '{self.config.name}'",
|
|
454
|
-
server=self.config.name,
|
|
455
|
-
error=server_error,
|
|
456
|
-
)
|
|
457
|
-
await self.on_error(error=server_error)
|
|
458
|
-
span.record_exception(server_error)
|
|
459
|
-
|
|
460
|
-
# --- Serialization Implementation ---
|
|
461
|
-
def to_dict(self, path_type: str = "relative") -> dict[str, Any]: # noqa: C901 - TODO: refactor to simplify serialization logic
|
|
462
|
-
"""Convert instance to dictionary representation suitable for serialization."""
|
|
463
|
-
from flock.core.registry import get_registry
|
|
464
|
-
|
|
465
|
-
registry = get_registry()
|
|
466
|
-
|
|
467
|
-
exclude = ["modules", "config"]
|
|
468
|
-
|
|
469
|
-
logger.debug(f"Serializing server '{self.config.name}' to dict.")
|
|
470
|
-
# Use Pydantic's dump, exclued manually handled fields.
|
|
471
|
-
data = self.model_dump(
|
|
472
|
-
exclude=exclude,
|
|
473
|
-
mode="json", # Use json mode for better handling of standard types by Pydantic
|
|
474
|
-
exclude_none=True, # Exclude None values for cleaner output
|
|
475
|
-
)
|
|
476
|
-
|
|
477
|
-
# --- Let the config handle its own serialization ---
|
|
478
|
-
config_data = self.config.to_dict(path_type=path_type)
|
|
479
|
-
data["config"] = config_data
|
|
480
|
-
|
|
481
|
-
builtin_by_transport = {}
|
|
482
|
-
|
|
483
|
-
try:
|
|
484
|
-
from flock.mcp.servers.sse.flock_sse_server import FlockSSEServer
|
|
485
|
-
from flock.mcp.servers.stdio.flock_stdio_server import (
|
|
486
|
-
FlockMCPStdioServer,
|
|
487
|
-
)
|
|
488
|
-
from flock.mcp.servers.streamable_http.flock_streamable_http_server import (
|
|
489
|
-
FlockStreamableHttpServer,
|
|
490
|
-
)
|
|
491
|
-
from flock.mcp.servers.websockets.flock_websocket_server import (
|
|
492
|
-
FlockWSServer,
|
|
493
|
-
)
|
|
494
|
-
|
|
495
|
-
builtin_by_transport = {
|
|
496
|
-
"stdio": FlockMCPStdioServer,
|
|
497
|
-
"streamable_http": FlockStreamableHttpServer,
|
|
498
|
-
"sse": FlockSSEServer,
|
|
499
|
-
"websockets": FlockWSServer,
|
|
500
|
-
}
|
|
501
|
-
except ImportError:
|
|
502
|
-
builtin_by_transport = {}
|
|
503
|
-
|
|
504
|
-
# --- Only emit full impl for non-builtins ---
|
|
505
|
-
transport = getattr(
|
|
506
|
-
self.config.connection_config, "transport_type", None
|
|
507
|
-
)
|
|
508
|
-
builtin_cls = builtin_by_transport.get(transport)
|
|
509
|
-
|
|
510
|
-
if type(self) is not builtin_cls:
|
|
511
|
-
file_path = inspect.getsourcefile(type(self))
|
|
512
|
-
if path_type == "relative":
|
|
513
|
-
file_path = os.path.relpath(file_path)
|
|
514
|
-
data["implementation"] = {
|
|
515
|
-
"class_name": type(self).__name__,
|
|
516
|
-
"module_path": type(self).__module__,
|
|
517
|
-
"file_path": file_path,
|
|
518
|
-
}
|
|
519
|
-
|
|
520
|
-
logger.debug(
|
|
521
|
-
f"Base server data for '{self.config.name}': {list(data.keys())}"
|
|
522
|
-
)
|
|
523
|
-
serialized_modules = {}
|
|
524
|
-
|
|
525
|
-
def add_serialized_component(component: Any, field_name: str):
|
|
526
|
-
if component:
|
|
527
|
-
comp_type = type(component)
|
|
528
|
-
type_name = registry.get_component_type_name(
|
|
529
|
-
comp_type
|
|
530
|
-
) # Get registered name
|
|
531
|
-
|
|
532
|
-
if type_name:
|
|
533
|
-
try:
|
|
534
|
-
serialized_component_data = serialize_item(component)
|
|
535
|
-
|
|
536
|
-
if not isinstance(serialized_component_data, dict):
|
|
537
|
-
logger.error(
|
|
538
|
-
f"Serialization of component {type_name} for field '{field_name}' did not result in a dictionary. Got: {type(serialized_component_data)}"
|
|
539
|
-
)
|
|
540
|
-
serialized_modules[field_name] = {
|
|
541
|
-
"type": type_name,
|
|
542
|
-
"name": getattr(component, "name", "unknown"),
|
|
543
|
-
"error": "serialization_failed_non_dict",
|
|
544
|
-
}
|
|
545
|
-
else:
|
|
546
|
-
serialized_component_data["type"] = type_name
|
|
547
|
-
serialized_modules[field_name] = (
|
|
548
|
-
serialized_component_data
|
|
549
|
-
)
|
|
550
|
-
logger.debug(
|
|
551
|
-
f"Successfully serialized component for field '{field_name}' (type: {type_name})"
|
|
552
|
-
)
|
|
553
|
-
except Exception as e:
|
|
554
|
-
logger.error(
|
|
555
|
-
f"Failed to serialize component {type_name} for field '{field_name}': {e}",
|
|
556
|
-
exc_info=True,
|
|
557
|
-
)
|
|
558
|
-
|
|
559
|
-
else:
|
|
560
|
-
logger.warning(
|
|
561
|
-
f"Cannot serialize unregistered component {comp_type.__name__} for field '{field_name}'"
|
|
562
|
-
)
|
|
563
|
-
|
|
564
|
-
serialized_modules = {}
|
|
565
|
-
for module in self.modules.values():
|
|
566
|
-
add_serialized_component(module, module.name)
|
|
567
|
-
|
|
568
|
-
if serialized_modules:
|
|
569
|
-
data["modules"] = serialized_modules
|
|
570
|
-
logger.debug(
|
|
571
|
-
f"Added {len(serialized_modules)} modules to server '{self.config.name}'"
|
|
572
|
-
)
|
|
573
|
-
|
|
574
|
-
def _clean(obj: Any) -> Any:
|
|
575
|
-
if isinstance(obj, dict):
|
|
576
|
-
return {
|
|
577
|
-
k: _clean(v)
|
|
578
|
-
for k, v in obj.items()
|
|
579
|
-
if v is not None
|
|
580
|
-
and not (isinstance(v, list | dict) and len(v) == 0)
|
|
581
|
-
}
|
|
582
|
-
if isinstance(obj, list):
|
|
583
|
-
return [
|
|
584
|
-
_clean(v)
|
|
585
|
-
for v in obj
|
|
586
|
-
if v is not None
|
|
587
|
-
and not (isinstance(v, dict | list) and len(v) == 0)
|
|
588
|
-
]
|
|
589
|
-
return obj
|
|
590
|
-
|
|
591
|
-
data = _clean(data)
|
|
592
|
-
return data
|
|
593
|
-
|
|
594
|
-
@classmethod
|
|
595
|
-
def from_dict(cls: type[T], data: dict[str, Any]) -> T:
|
|
596
|
-
"""Deserialize the server from a dictionary, including components."""
|
|
597
|
-
logger.debug(
|
|
598
|
-
f"Deserializing server from dict. Keys: {list(data.keys())}"
|
|
599
|
-
)
|
|
600
|
-
|
|
601
|
-
builtin_by_transport = {}
|
|
602
|
-
|
|
603
|
-
try:
|
|
604
|
-
from flock.mcp.servers.sse.flock_sse_server import FlockSSEServer
|
|
605
|
-
from flock.mcp.servers.stdio.flock_stdio_server import (
|
|
606
|
-
FlockMCPStdioServer,
|
|
607
|
-
)
|
|
608
|
-
from flock.mcp.servers.streamable_http.flock_streamable_http_server import (
|
|
609
|
-
FlockStreamableHttpServer,
|
|
610
|
-
)
|
|
611
|
-
from flock.mcp.servers.websockets.flock_websocket_server import (
|
|
612
|
-
FlockWSServer,
|
|
613
|
-
)
|
|
614
|
-
|
|
615
|
-
builtin_by_transport = {
|
|
616
|
-
"stdio": FlockMCPStdioServer,
|
|
617
|
-
"sse": FlockSSEServer,
|
|
618
|
-
"streamable_http": FlockStreamableHttpServer,
|
|
619
|
-
"websockets": FlockWSServer,
|
|
620
|
-
}
|
|
621
|
-
except ImportError:
|
|
622
|
-
builtin_by_transport = {}
|
|
623
|
-
|
|
624
|
-
# find custom impl or built-in
|
|
625
|
-
impl = data.pop("implementation", None)
|
|
626
|
-
if impl:
|
|
627
|
-
mod = importlib.import_module(impl["module_path"])
|
|
628
|
-
real_cls = getattr(mod, impl["class_name"])
|
|
629
|
-
else:
|
|
630
|
-
# built-in: inspect transport_type in data["config"]
|
|
631
|
-
transport = data["config"]["connection_config"]["transport_type"]
|
|
632
|
-
real_cls = builtin_by_transport.get(transport, cls)
|
|
633
|
-
|
|
634
|
-
# deserialize the config:
|
|
635
|
-
config_data = data.pop("config", None)
|
|
636
|
-
if config_data:
|
|
637
|
-
# Forcing a square into a round hole
|
|
638
|
-
# pretty ugly, but gets the job done.
|
|
639
|
-
try:
|
|
640
|
-
config_field = real_cls.model_fields["config"]
|
|
641
|
-
config_cls = config_field.annotation
|
|
642
|
-
except (AttributeError, KeyError):
|
|
643
|
-
# fallback if Pydantic v1 or missing
|
|
644
|
-
config_cls = FlockMCPConfiguration
|
|
645
|
-
config_object = config_cls.from_dict(config_data)
|
|
646
|
-
data["config"] = config_object
|
|
647
|
-
|
|
648
|
-
# now construct
|
|
649
|
-
server = real_cls(
|
|
650
|
-
**{
|
|
651
|
-
k: v
|
|
652
|
-
for k, v in data.items()
|
|
653
|
-
if k not in ["modules", "components"]
|
|
654
|
-
}
|
|
655
|
-
)
|
|
656
|
-
|
|
657
|
-
# re-hydrate components (both legacy modules and new components)
|
|
658
|
-
for cname, cdata in data.get("components", {}).items():
|
|
659
|
-
server.add_component(deserialize_component(cdata, AgentComponent))
|
|
660
|
-
|
|
661
|
-
# Handle legacy modules for backward compatibility during transition
|
|
662
|
-
for mname, mdata in data.get("modules", {}).items():
|
|
663
|
-
logger.warning(
|
|
664
|
-
f"Legacy module '{mname}' found during deserialization - consider migrating to unified components"
|
|
665
|
-
)
|
|
666
|
-
# Skip legacy modules during migration
|
|
667
|
-
|
|
668
|
-
# --- Separate Data ---
|
|
669
|
-
component_configs = {}
|
|
670
|
-
server_data = {}
|
|
671
|
-
component_keys = ["modules"]
|
|
672
|
-
|
|
673
|
-
for key, value in data.items():
|
|
674
|
-
if key in component_keys and value is not None:
|
|
675
|
-
component_configs[key] = value
|
|
676
|
-
else:
|
|
677
|
-
server_data[key] = value
|
|
678
|
-
|
|
679
|
-
logger.info(f"Successfully deserialized server '{server.config.name}'")
|
|
680
|
-
return server
|