code-puppy 0.0.891__tar.gz → 0.0.892__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {code_puppy-0.0.891 → code_puppy-0.0.892}/PKG-INFO +1 -1
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/add_model_vllm.py +68 -15
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/async_lifecycle.py +6 -2
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/toolset_utils.py +27 -5
- {code_puppy-0.0.891 → code_puppy-0.0.892}/pyproject.toml +1 -1
- {code_puppy-0.0.891 → code_puppy-0.0.892}/.gitignore +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/LICENSE +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/README.md +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/__main__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/_plugin_i18n_lifecycle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/_pydantic_tool_helpers.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/_pydantic_video_patch.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agent_completion_inbox.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agent_execution_context.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_builder.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_code_mode.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_code_mode_guidance.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_compaction.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_diagnostics.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_foreign_thinking.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_history.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_key_listeners.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_model_message_transform.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_non_streaming_render.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_output_limits.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_run_signals.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_runtime.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_steer_processor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_subagent_recursion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_windows_console.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/_wire_tool_names.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_code_puppy.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_creator_agent.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_helios.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_manager.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_model_judge.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_planning.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_qa_kitten.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/agent_web_retriever.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/base_agent.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/event_stream_handler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/json_agent.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/retry_checkpoint.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/retry_profiles.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/run_stats.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/smooth_stream.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/stream_status.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/subagent_stream_handler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/agents/thinking_output.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/asyncio_cleanup.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/atomic_io.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/atomic_json.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/ca_bundle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/callbacks.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/capabilities/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/capabilities/compaction.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/capabilities/eager_timing.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/chatgpt_codex_client.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/claude_cache_client.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/claude_oauth_transport.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/cli_runner.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/add_model_details.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/add_model_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/add_model_menus.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/agent_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/attachments.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/autosave_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/autosave_search.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/clipboard.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/colors_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/command_handler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/command_registry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/completers.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/completion_cache.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/config_apply.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/config_commands.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/core_commands.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/file_index.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/file_path_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/help_catalog.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/help_overlay.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/image_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/load_context_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/base.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/catalog_server_installer.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/custom_server_form.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/custom_server_installer.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/edit_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/handler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/help_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/install_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/install_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/list_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/logs_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/mcp_servers_store.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/remove_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/restart_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/search_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/silence_warning_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/start_all_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/start_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/status_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/stop_all_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/stop_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/trust_command.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/wizard_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp_binding_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/menu_session.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/model_picker_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/model_settings_defs.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/model_settings_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/onboarding_slides.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/onboarding_wizard.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/pagination.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/pin_command_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/refresh_models.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/session_browser.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/session_browser_data.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/session_commands.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu_catalog.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu_schema.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu_settings.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu_shims.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/set_menu_values.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/shell_passthrough.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/skills_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/tui_style.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/uc_menu.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/config.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/config_file.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/diagnostics.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/error_logging.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/events/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/events/bridge.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/file_completion_io.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/file_completion_tokens.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/gemini_code_assist.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/gemini_common.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/gemini_model.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/README.md +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/aliases.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/engine.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/executor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/matcher.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/models.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/registry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/hook_engine/validator.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/http_retry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/http_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/httpx2_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/audit.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/catalog.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/formats.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/interpolation.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/locale.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/locales/en-US.json +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/locales/es.json +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/locales/fr-CA.json +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/plugin_catalog.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/plurals.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/pseudo.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/i18n/translate.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/kennel_provider.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/keymap.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/list_filtering.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/main.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/agent_bindings.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/blocking_startup.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/circuit_breaker.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/config_wizard.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/dashboard.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/error_isolation.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/examples/retry_example.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/health_monitor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/http_auth.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/managed_server.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/manager.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/manager_lifecycle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/mcp_logs.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/project_config.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/registry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/retry_manager.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/server_registry_catalog.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/status_tracker.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/system_tools.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_/tool_arg_coercion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_prompts/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/mcp_prompts/hook_creator.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/bar_painters.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/bar_rendering.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/bottom_bar.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/bus.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/chords.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/commands.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_actions.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_completion.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_display.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_history.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_keys.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_paste.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_queue.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/editor_submission.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/external_editor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/identity_line.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/idle_status.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/inline_bar.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/line_editor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/markdown_patches.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/menu_lifecycle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/message_queue.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/messages.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/pause_controller.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/prompt_prefix_style.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/queue_console.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/renderers.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/rich_renderer.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/run_ui.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/run_ui_wiring.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/speculation_line.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/speculation_stats.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/speculation_toggle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/spinner/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/status_line.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/subagent_console.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/theme_accent.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/tool_output.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/messaging/transcript_guard.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/model_descriptions.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/model_factory.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/model_switching.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/model_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/models.json +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/models_dev_api.json +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/models_dev_parser.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/observability.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/platform_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/config.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/oauth_pasteback.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/oauth_puppy_html.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/trust.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/plugins/trust_notice.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/private_inference.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/provider_credentials.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/provider_identity.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/pydantic_patches.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/reopenable_async_client.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/round_robin_model.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/secret_store.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/secret_store_backends.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/session_format_migration.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/session_lifecycle.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/session_migration.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/session_storage.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/session_surrogate_unpickler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/shared_credentials.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/skill_provider.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/splash.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/status_display.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/steer_metadata.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/terminal_utils.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/token_usage.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/_browser_registry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/_lazy.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/agent_tools.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/constants.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/demo_tui.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/handler.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/models.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/registration.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/renderers.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/terminal_ui.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/theme.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ask_user_question/tui_loop.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/__init__.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_control.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_interactions.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_locator_resolver.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_locators.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_manager.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_navigation.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_page_snapshot.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_screenshot.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_scripts.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_semantic_interactions.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/browser_workflows.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/browser/tool_registry.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/command_runner.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/common.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/display.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/file_modifications.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/file_operations.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/file_permission_state.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/fs_access.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/image_tools.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/io_backends.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/model_tools.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/ripgrep.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/shell_backgrounding.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/skills_tools.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/subagent_context.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/subagent_invocation.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/subagent_usage_metrics.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/tools_content.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/tools/universal_constructor.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/undo_manager.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/universal_constructor_provider.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/version_checker.py +0 -0
- {code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/zai_model.py +0 -0
|
@@ -13,7 +13,7 @@ and TextInput helper via lazy imports to avoid an import cycle.
|
|
|
13
13
|
|
|
14
14
|
from __future__ import annotations
|
|
15
15
|
|
|
16
|
-
from typing import Callable, List, Optional
|
|
16
|
+
from typing import Callable, Dict, List, Optional
|
|
17
17
|
|
|
18
18
|
import httpx
|
|
19
19
|
|
|
@@ -35,6 +35,12 @@ VLLM_API_KEY_ENV = "VLLM_API_KEY"
|
|
|
35
35
|
# placeholder vLLM itself prints in its curl examples.
|
|
36
36
|
VLLM_PLACEHOLDER_API_KEY = "EMPTY"
|
|
37
37
|
|
|
38
|
+
# Context size stamped on persisted vLLM model configs when the server's
|
|
39
|
+
# /v1/models JSON advertises none. vLLM reports ``max_model_len`` per entry
|
|
40
|
+
# when it can; anything without one gets this floor so token accounting and
|
|
41
|
+
# compaction use a realistic window instead of the 128k global fallback.
|
|
42
|
+
VLLM_DEFAULT_CONTEXT_LENGTH = 262_144
|
|
43
|
+
|
|
38
44
|
_FETCH_TIMEOUT_S = 10.0
|
|
39
45
|
_MODEL_SUFFIXES = ("/v1/models", "/models", "/v1")
|
|
40
46
|
|
|
@@ -89,18 +95,18 @@ def resolve_api_key_ref(api_key_ref: str) -> Optional[str]:
|
|
|
89
95
|
return api_key_ref
|
|
90
96
|
|
|
91
97
|
|
|
92
|
-
def
|
|
98
|
+
def _fetch_vllm_entries(
|
|
93
99
|
base_url: str,
|
|
94
100
|
*,
|
|
95
101
|
api_key: Optional[str] = None,
|
|
96
102
|
http_get: Optional[Callable] = None,
|
|
97
|
-
) -> List[
|
|
98
|
-
"""
|
|
103
|
+
) -> List[dict]:
|
|
104
|
+
"""GET ``{base}/v1/models`` and return the entry dicts.
|
|
99
105
|
|
|
100
106
|
``api_key`` is sent as a bearer token when given (servers started with
|
|
101
107
|
``--api-key`` gate the listing too). ``http_get`` is injectable for tests.
|
|
102
108
|
Raises :class:`VllmFetchError` on any transport error, non-2xx status,
|
|
103
|
-
non-JSON body, or unexpected shape.
|
|
109
|
+
non-JSON body, or unexpected shape. Non-dict entries are dropped.
|
|
104
110
|
"""
|
|
105
111
|
url = models_endpoint(base_url)
|
|
106
112
|
getter = http_get or httpx.get
|
|
@@ -117,19 +123,55 @@ def fetch_vllm_model_ids(
|
|
|
117
123
|
data = payload.get("data") if isinstance(payload, dict) else None
|
|
118
124
|
if not isinstance(data, list):
|
|
119
125
|
raise VllmFetchError("response has no 'data' list")
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
126
|
+
return [entry for entry in data if isinstance(entry, dict)]
|
|
127
|
+
|
|
128
|
+
|
|
129
|
+
def _context_length_from_entry(entry: dict) -> int:
|
|
130
|
+
"""Context size a ``/v1/models`` entry advertises; 0 when it does not.
|
|
131
|
+
|
|
132
|
+
vLLM reports ``max_model_len``; some OpenAI-compatible servers use
|
|
133
|
+
``context_length``. Anything missing or non-positive means "unknown" so
|
|
134
|
+
the caller can fall back to :data:`VLLM_DEFAULT_CONTEXT_LENGTH`.
|
|
135
|
+
"""
|
|
136
|
+
for key in ("max_model_len", "context_length"):
|
|
137
|
+
value = entry.get(key)
|
|
138
|
+
if isinstance(value, int) and not isinstance(value, bool) and value > 0:
|
|
139
|
+
return value
|
|
140
|
+
return 0
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
def fetch_vllm_model_contexts(
|
|
144
|
+
base_url: str,
|
|
145
|
+
*,
|
|
146
|
+
api_key: Optional[str] = None,
|
|
147
|
+
http_get: Optional[Callable] = None,
|
|
148
|
+
) -> Dict[str, int]:
|
|
149
|
+
"""Query ``{base}/v1/models`` and map model id -> advertised context.
|
|
150
|
+
|
|
151
|
+
Entries without a usable context size map to 0; the persisted config
|
|
152
|
+
replaces that with :data:`VLLM_DEFAULT_CONTEXT_LENGTH`.
|
|
153
|
+
"""
|
|
154
|
+
contexts: Dict[str, int] = {}
|
|
155
|
+
for entry in _fetch_vllm_entries(base_url, api_key=api_key, http_get=http_get):
|
|
156
|
+
model_id = entry.get("id")
|
|
123
157
|
if isinstance(model_id, str) and model_id.strip():
|
|
124
|
-
|
|
125
|
-
return
|
|
158
|
+
contexts[model_id.strip()] = _context_length_from_entry(entry)
|
|
159
|
+
return contexts
|
|
126
160
|
|
|
127
161
|
|
|
128
|
-
def build_vllm_model_config(
|
|
162
|
+
def build_vllm_model_config(
|
|
163
|
+
model_id: str,
|
|
164
|
+
base_url: str,
|
|
165
|
+
api_key_ref: str,
|
|
166
|
+
context_length: Optional[int] = None,
|
|
167
|
+
) -> dict:
|
|
129
168
|
"""A Code Puppy ``custom_openai`` config for one vLLM model.
|
|
130
169
|
|
|
131
170
|
``api_key_ref`` is either ``$VLLM_API_KEY`` (a real key was supplied) or
|
|
132
171
|
the literal :data:`VLLM_PLACEHOLDER_API_KEY` for an unauthenticated server.
|
|
172
|
+
``context_length`` is what the server's JSON advertised; when it carried
|
|
173
|
+
none (``None``/non-positive) the config gets
|
|
174
|
+
:data:`VLLM_DEFAULT_CONTEXT_LENGTH` so token accounting has a real number.
|
|
133
175
|
"""
|
|
134
176
|
return {
|
|
135
177
|
"type": "custom_openai",
|
|
@@ -139,6 +181,11 @@ def build_vllm_model_config(model_id: str, base_url: str, api_key_ref: str) -> d
|
|
|
139
181
|
"url": openai_endpoint(base_url),
|
|
140
182
|
"api_key": api_key_ref,
|
|
141
183
|
},
|
|
184
|
+
"context_length": (
|
|
185
|
+
context_length
|
|
186
|
+
if context_length and context_length > 0
|
|
187
|
+
else VLLM_DEFAULT_CONTEXT_LENGTH
|
|
188
|
+
),
|
|
142
189
|
"supported_settings": ["temperature", "seed", "top_p"],
|
|
143
190
|
}
|
|
144
191
|
|
|
@@ -343,14 +390,16 @@ def _auth_failure_hint(error_text: str, *, authenticated: bool) -> Optional[str]
|
|
|
343
390
|
def run_vllm_flow(
|
|
344
391
|
*,
|
|
345
392
|
url_prompt: Callable = prompt_for_vllm_url,
|
|
346
|
-
fetch_models: Callable =
|
|
393
|
+
fetch_models: Callable = fetch_vllm_model_contexts,
|
|
347
394
|
models_menu_factory: Callable = build_vllm_models_menu,
|
|
348
395
|
api_key_prompt: Callable = choose_vllm_api_key,
|
|
349
396
|
) -> bool:
|
|
350
397
|
"""URL -> key (none/new/saved) -> /v1/models -> pick -> persist.
|
|
351
398
|
|
|
352
399
|
The key comes *before* the listing because a server started with
|
|
353
|
-
``--api-key`` 401s on ``/v1/models`` too.
|
|
400
|
+
``--api-key`` 401s on ``/v1/models`` too. ``fetch_models`` maps model
|
|
401
|
+
id -> advertised context length (0 when the JSON carries none, which the
|
|
402
|
+
persisted config then defaults to 256k). Collaborators are injectable
|
|
354
403
|
so tests can script every stage.
|
|
355
404
|
"""
|
|
356
405
|
base_url = url_prompt()
|
|
@@ -373,13 +422,14 @@ def run_vllm_flow(
|
|
|
373
422
|
|
|
374
423
|
listing = models_endpoint(base_url)
|
|
375
424
|
try:
|
|
376
|
-
|
|
425
|
+
model_contexts = fetch_models(base_url, api_key=api_key)
|
|
377
426
|
except VllmFetchError as exc:
|
|
378
427
|
emit_error(t("model_menu.vllm.fetch_failed", url=listing, error=exc))
|
|
379
428
|
hint = _auth_failure_hint(str(exc), authenticated=bool(api_key))
|
|
380
429
|
if hint:
|
|
381
430
|
emit_warning(hint)
|
|
382
431
|
return False
|
|
432
|
+
model_ids = list(model_contexts)
|
|
383
433
|
if not model_ids:
|
|
384
434
|
emit_warning(t("model_menu.vllm.no_models", url=listing))
|
|
385
435
|
return False
|
|
@@ -394,5 +444,8 @@ def run_vllm_flow(
|
|
|
394
444
|
|
|
395
445
|
model_key = extra_model_key(VLLM_PROVIDER_ID, model_id)
|
|
396
446
|
return add_config_to_extra_config(
|
|
397
|
-
model_key,
|
|
447
|
+
model_key,
|
|
448
|
+
build_vllm_model_config(
|
|
449
|
+
model_id, base_url, api_key_ref, model_contexts.get(model_id)
|
|
450
|
+
),
|
|
398
451
|
)
|
|
@@ -14,7 +14,11 @@ from typing import Any, Dict, Optional
|
|
|
14
14
|
|
|
15
15
|
from pydantic_ai.toolsets import AbstractToolset
|
|
16
16
|
|
|
17
|
-
from code_puppy.mcp_.toolset_utils import
|
|
17
|
+
from code_puppy.mcp_.toolset_utils import (
|
|
18
|
+
toolset_init_timeout,
|
|
19
|
+
toolset_is_running,
|
|
20
|
+
unwrap_toolset,
|
|
21
|
+
)
|
|
18
22
|
|
|
19
23
|
logger = logging.getLogger(__name__)
|
|
20
24
|
|
|
@@ -127,7 +131,7 @@ class AsyncServerLifecycleManager:
|
|
|
127
131
|
try:
|
|
128
132
|
# Wrappers need their leaf's timeout. None explicitly disables the
|
|
129
133
|
# deadline; generic toolsets without one retain the 10s fallback.
|
|
130
|
-
timeout =
|
|
134
|
+
timeout = toolset_init_timeout(server, default=10.0)
|
|
131
135
|
async with asyncio.timeout(timeout):
|
|
132
136
|
await context.exit_stack.enter_async_context(server)
|
|
133
137
|
if context.stopping:
|
|
@@ -7,15 +7,20 @@ cached tool definitions) should use these helpers instead of poking at
|
|
|
7
7
|
private attributes on whatever object they happen to hold.
|
|
8
8
|
|
|
9
9
|
Only ``.wrapped`` (public ``WrapperToolset`` API) and ``.prefix`` (public
|
|
10
|
-
``PrefixedToolset`` API) are used for traversal. The
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
10
|
+
``PrefixedToolset`` API) are used for traversal. The private reads left in
|
|
11
|
+
the codebase are quarantined here behind defensive ``getattr``s:
|
|
12
|
+
|
|
13
|
+
* ``MCPToolset._cached_tools`` (``iter_cached_tool_defs``) — pydantic-ai
|
|
14
|
+
exposes no *synchronous* tool-listing API (``list_tools()`` is async and
|
|
15
|
+
performs I/O; token estimation must stay sync + side-effect-free).
|
|
16
|
+
* ``fastmcp.Client._init_timeout`` (``toolset_init_timeout``) — pydantic-ai
|
|
17
|
+
forwards ``init_timeout`` to its fastmcp client without keeping a copy.
|
|
15
18
|
"""
|
|
16
19
|
|
|
17
20
|
from typing import Any, Dict, Iterator, List, Optional, Tuple
|
|
18
21
|
|
|
22
|
+
_MISSING = object()
|
|
23
|
+
|
|
19
24
|
|
|
20
25
|
def unwrap_toolset(toolset: Any) -> Any:
|
|
21
26
|
"""Follow public ``.wrapped`` links down to the leaf toolset."""
|
|
@@ -67,6 +72,23 @@ def tool_input_schema(mcp_tool: Any) -> Optional[Dict[str, Any]]:
|
|
|
67
72
|
return getattr(mcp_tool, "inputSchema", None)
|
|
68
73
|
|
|
69
74
|
|
|
75
|
+
def toolset_init_timeout(toolset: Any, default: Optional[float]) -> Optional[float]:
|
|
76
|
+
"""Seconds the leaf toolset allows for startup; ``None`` means no deadline.
|
|
77
|
+
|
|
78
|
+
``MCPToolset`` has no ``init_timeout`` attribute — it hands the value to
|
|
79
|
+
its fastmcp ``Client``, which stores it (normalized, ``0`` → ``None``) as
|
|
80
|
+
``_init_timeout``. Missing that read silently swapped every configured
|
|
81
|
+
timeout (330s for OAuth, 60s for stdio) for ``default``. A leaf-level
|
|
82
|
+
``init_timeout`` attribute still wins for duck-typed toolsets.
|
|
83
|
+
"""
|
|
84
|
+
leaf = unwrap_toolset(toolset)
|
|
85
|
+
timeout = getattr(leaf, "init_timeout", _MISSING)
|
|
86
|
+
if timeout is _MISSING:
|
|
87
|
+
client = getattr(leaf, "client", None)
|
|
88
|
+
timeout = getattr(client, "_init_timeout", _MISSING)
|
|
89
|
+
return default if timeout is _MISSING else timeout
|
|
90
|
+
|
|
91
|
+
|
|
70
92
|
def toolset_is_running(toolset: Any) -> bool:
|
|
71
93
|
"""Whether the leaf toolset currently holds an open server session."""
|
|
72
94
|
return bool(getattr(unwrap_toolset(toolset), "is_running", False))
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/load_context_completion.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/catalog_server_installer.py
RENAMED
|
File without changes
|
|
File without changes
|
{code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/custom_server_installer.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/mcp/silence_warning_command.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{code_puppy-0.0.891 → code_puppy-0.0.892}/code_puppy/command_line/model_picker_completion.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|