meshagent-cli 0.54.2__tar.gz → 0.55.0__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.
- {meshagent_cli-0.54.2/meshagent_cli.egg-info → meshagent_cli-0.55.0}/PKG-INFO +17 -17
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agents.py +86 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agents_test.py +87 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/auth.py +18 -2
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/auth_test.py +1 -1
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/local_settings.py +163 -43
- meshagent_cli-0.55.0/meshagent/cli/local_settings_test.py +363 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sqlite.py +110 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sqlite_test.py +17 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/storage.py +6 -6
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/storage_test.py +70 -1
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/auth_switch.py +6 -6
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/auth_switch_test.py +35 -5
- meshagent_cli-0.55.0/meshagent/cli/version.py +1 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0/meshagent_cli.egg-info}/PKG-INFO +17 -17
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent_cli.egg-info/requires.txt +16 -16
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/pyproject.toml +16 -16
- meshagent_cli-0.54.2/meshagent/cli/local_settings_test.py +0 -155
- meshagent_cli-0.54.2/meshagent/cli/version.py +0 -1
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/LICENSE +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/README.md +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/__init__.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/_filedrop.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agent.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agent_cli_options_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agent_package_cli.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/agent_package_cli_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/ask.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/ask_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/async_typer.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/async_typer_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/auth_async.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/auth_async_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/call.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/chatbot.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/cli.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/cli_mcp.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/cli_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/common_options.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/config.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/config_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/containers.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/containers_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/__init__.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/backend-agent/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/contact-form/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/slack-channel/channel.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/slack-channel/scripts/configure-slack.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/slack-channel/scripts/setup-slack-dev-route.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/slack-channel/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/task-queue-dashboard/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/telegram-channel/channel.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/telegram-channel/scripts/configure-telegram.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/telegram-channel/scripts/create-bot-token.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/telegram-channel/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/twilio-channel/channel.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/twilio-channel/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/webserver/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/whatsapp-channel/channel.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_project_templates/python/whatsapp-channel/server.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/create_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/custom_domains.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/custom_domains_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/dataset.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/dataset_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/developer.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/developer_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/doctor.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/doctor_dockerfiles/__init__.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/doctor_templates/__init__.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/doctor_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/feeds.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/feeds_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/helper.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/helper_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/helpers.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/host.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/iam.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/iam_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/image.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/image_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/launch.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/launch_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/llm.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/llm_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/mailbot.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/mailbot_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/mailboxes.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/mailboxes_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/meeting_transcriber.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/memory.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/memory_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/meshagent_images.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/meshagent_images_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/messaging.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/messaging_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/mounts.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/multi.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/oauth_clients.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/oauth_clients_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/oci_archive.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/oci_archive_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/participant_token.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/port.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/port_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/preamble_rules.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/preamble_rules_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/process.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/process_live_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/process_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/projects.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/projects_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/queue.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/queue_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/registry.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/registry_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/room.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/room_connect.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/room_connect_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/room_services.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/room_services_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/rooms.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/rooms_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/root_commands.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/root_commands_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/routes.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/routes_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sample_channel_http_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sample_channel_live_e2e_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/scheduled_tasks.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/scheduled_tasks_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/secrets.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/secrets_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/service_accounts.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/service_accounts_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/services.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/services_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sessions.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sessions_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sqlite_recovery.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sqlite_recovery_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sqlite_transfer_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/subscriptions.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sync.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sync_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/sysadmin.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/task_runner.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/task_runner_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/testing.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/thread_inspect.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/thread_inspect_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/thread_sidebar.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tool_call_summary.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tool_call_summary_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tool_integrations.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tool_integrations_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/__init__.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/create.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/deploy_room.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/deploy_room_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/project_activate.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/project_activate_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/setup.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/setup_splash_frames.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/tui/setup_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/users.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/users_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/version_check.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/version_check_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/voicebot.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/volumes.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/volumes_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/webserver.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/webserver_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/worker.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent/cli/worker_test.py +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent_cli.egg-info/SOURCES.txt +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent_cli.egg-info/dependency_links.txt +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent_cli.egg-info/entry_points.txt +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/meshagent_cli.egg-info/top_level.txt +0 -0
- {meshagent_cli-0.54.2 → meshagent_cli-0.55.0}/setup.cfg +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: meshagent-cli
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.55.0
|
|
4
4
|
Summary: CLI for Meshagent
|
|
5
5
|
License-Expression: Apache-2.0
|
|
6
6
|
Project-URL: Documentation, https://docs.meshagent.com
|
|
@@ -22,8 +22,8 @@ Requires-Dist: openpyxl~=3.1
|
|
|
22
22
|
Requires-Dist: xlsxwriter~=3.2
|
|
23
23
|
Requires-Dist: pathspec<2,>=1.0.3
|
|
24
24
|
Requires-Dist: zstandard~=0.25.0
|
|
25
|
-
Requires-Dist: meshagent-llm-proxy==0.
|
|
26
|
-
Requires-Dist: meshagent-codex==0.
|
|
25
|
+
Requires-Dist: meshagent-llm-proxy==0.55.0
|
|
26
|
+
Requires-Dist: meshagent-codex==0.55.0
|
|
27
27
|
Requires-Dist: rich~=14.3.0
|
|
28
28
|
Requires-Dist: sounddevice~=0.5
|
|
29
29
|
Requires-Dist: textual<9.0,>=8.2.3
|
|
@@ -32,23 +32,23 @@ Requires-Dist: prompt-toolkit~=3.0.52
|
|
|
32
32
|
Requires-Dist: ascii-magic~=2.3
|
|
33
33
|
Requires-Dist: pillow~=11.3.0
|
|
34
34
|
Provides-Extra: all
|
|
35
|
-
Requires-Dist: meshagent-agents[all]==0.
|
|
36
|
-
Requires-Dist: meshagent-api[all]==0.
|
|
37
|
-
Requires-Dist: meshagent-commoncrawl==0.
|
|
38
|
-
Requires-Dist: meshagent-scrapy==0.
|
|
39
|
-
Requires-Dist: meshagent-computers==0.
|
|
40
|
-
Requires-Dist: meshagent-openai==0.
|
|
41
|
-
Requires-Dist: meshagent-anthropic==0.
|
|
42
|
-
Requires-Dist: meshagent-otel==0.
|
|
43
|
-
Requires-Dist: meshagent-mcp==0.
|
|
44
|
-
Requires-Dist: meshagent-tools==0.
|
|
35
|
+
Requires-Dist: meshagent-agents[all]==0.55.0; extra == "all"
|
|
36
|
+
Requires-Dist: meshagent-api[all]==0.55.0; extra == "all"
|
|
37
|
+
Requires-Dist: meshagent-commoncrawl==0.55.0; extra == "all"
|
|
38
|
+
Requires-Dist: meshagent-scrapy==0.55.0; extra == "all"
|
|
39
|
+
Requires-Dist: meshagent-computers==0.55.0; extra == "all"
|
|
40
|
+
Requires-Dist: meshagent-openai==0.55.0; extra == "all"
|
|
41
|
+
Requires-Dist: meshagent-anthropic==0.55.0; extra == "all"
|
|
42
|
+
Requires-Dist: meshagent-otel==0.55.0; extra == "all"
|
|
43
|
+
Requires-Dist: meshagent-mcp==0.55.0; extra == "all"
|
|
44
|
+
Requires-Dist: meshagent-tools==0.55.0; extra == "all"
|
|
45
45
|
Requires-Dist: supabase-auth~=2.28.0; extra == "all"
|
|
46
46
|
Requires-Dist: prompt-toolkit~=3.0.52; extra == "all"
|
|
47
47
|
Provides-Extra: mcp-service
|
|
48
|
-
Requires-Dist: meshagent-agents[all]==0.
|
|
49
|
-
Requires-Dist: meshagent-api==0.
|
|
50
|
-
Requires-Dist: meshagent-mcp==0.
|
|
51
|
-
Requires-Dist: meshagent-tools==0.
|
|
48
|
+
Requires-Dist: meshagent-agents[all]==0.55.0; extra == "mcp-service"
|
|
49
|
+
Requires-Dist: meshagent-api==0.55.0; extra == "mcp-service"
|
|
50
|
+
Requires-Dist: meshagent-mcp==0.55.0; extra == "mcp-service"
|
|
51
|
+
Requires-Dist: meshagent-tools==0.55.0; extra == "mcp-service"
|
|
52
52
|
Requires-Dist: supabase-auth~=2.28.0; extra == "mcp-service"
|
|
53
53
|
Dynamic: license-file
|
|
54
54
|
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import asyncio
|
|
1
2
|
import json
|
|
3
|
+
from pathlib import Path
|
|
4
|
+
import shutil
|
|
2
5
|
import os
|
|
3
6
|
from typing import Annotated, Any, Awaitable, Callable, Literal, Optional
|
|
4
7
|
|
|
@@ -24,6 +27,11 @@ from meshagent.cli.storage import app as storage_app
|
|
|
24
27
|
app = async_typer.AsyncTyper(
|
|
25
28
|
help="Create, list, and manage managed agents in a project"
|
|
26
29
|
)
|
|
30
|
+
tools_app = async_typer.AsyncTyper(
|
|
31
|
+
help="Run embedded Python tools locally without deploying"
|
|
32
|
+
)
|
|
33
|
+
app.add_typer(tools_app, name="tools")
|
|
34
|
+
|
|
27
35
|
app.add_typer(
|
|
28
36
|
storage_app,
|
|
29
37
|
name="storage",
|
|
@@ -750,3 +758,81 @@ async def agent_use_command(
|
|
|
750
758
|
raise typer.Exit(1)
|
|
751
759
|
finally:
|
|
752
760
|
await account_client.close()
|
|
761
|
+
|
|
762
|
+
|
|
763
|
+
@tools_app.command("test")
|
|
764
|
+
async def test_python_tool(
|
|
765
|
+
spec: Annotated[
|
|
766
|
+
Path, typer.Argument(help="Agent YAML file", exists=True, dir_okay=False)
|
|
767
|
+
],
|
|
768
|
+
tool: Annotated[str, typer.Option("--tool", help="Tool name to invoke")],
|
|
769
|
+
input_json: Annotated[
|
|
770
|
+
str, typer.Option("--input", help="JSON arguments for the tool")
|
|
771
|
+
],
|
|
772
|
+
allow_private_http: Annotated[
|
|
773
|
+
bool,
|
|
774
|
+
typer.Option(
|
|
775
|
+
"--allow-private-http",
|
|
776
|
+
help="Allow local/private HTTP destinations for development",
|
|
777
|
+
),
|
|
778
|
+
] = False,
|
|
779
|
+
):
|
|
780
|
+
"""Run the current embedded source with live HTTP, without saving or deploying.
|
|
781
|
+
|
|
782
|
+
Secret-backed connections use your current authenticated identity.
|
|
783
|
+
"""
|
|
784
|
+
import yaml
|
|
785
|
+
|
|
786
|
+
configuration = ManagedAgentSpec.model_validate(yaml.safe_load(spec.read_text()))
|
|
787
|
+
selected = next((item for item in configuration.tools if item.name == tool), None)
|
|
788
|
+
if selected is None:
|
|
789
|
+
raise RoomException(f"Unknown Python tool: {tool}")
|
|
790
|
+
arguments = _maybe_parse_json_object("input", input_json)
|
|
791
|
+
binary = os.environ.get("MESHAGENT_PYTHON_TOOLS_BIN") or shutil.which(
|
|
792
|
+
"meshagent-python-tools"
|
|
793
|
+
)
|
|
794
|
+
if binary is None:
|
|
795
|
+
raise RoomException(
|
|
796
|
+
"Install meshagent-python-tools and Monty, or set MESHAGENT_PYTHON_TOOLS_BIN and MESHAGENT_MONTY_BIN"
|
|
797
|
+
)
|
|
798
|
+
proxy = None
|
|
799
|
+
if any(
|
|
800
|
+
connection.use_proxy_secret for connection in configuration.connections.values()
|
|
801
|
+
):
|
|
802
|
+
client = await get_client()
|
|
803
|
+
try:
|
|
804
|
+
proxy = {"base_url": client.base_url, "token": client.token}
|
|
805
|
+
finally:
|
|
806
|
+
await client.close()
|
|
807
|
+
payload = {
|
|
808
|
+
"tool": selected.model_dump(),
|
|
809
|
+
"connections": {
|
|
810
|
+
name: value.model_dump()
|
|
811
|
+
for name, value in configuration.connections.items()
|
|
812
|
+
},
|
|
813
|
+
"input": arguments,
|
|
814
|
+
"proxy": proxy,
|
|
815
|
+
"allow_private_http": allow_private_http,
|
|
816
|
+
}
|
|
817
|
+
process = await asyncio.create_subprocess_exec(
|
|
818
|
+
binary,
|
|
819
|
+
stdin=asyncio.subprocess.PIPE,
|
|
820
|
+
stdout=asyncio.subprocess.PIPE,
|
|
821
|
+
stderr=asyncio.subprocess.PIPE,
|
|
822
|
+
)
|
|
823
|
+
try:
|
|
824
|
+
stdout, stderr = await asyncio.wait_for(
|
|
825
|
+
process.communicate(json.dumps(payload).encode()), timeout=40
|
|
826
|
+
)
|
|
827
|
+
except BaseException:
|
|
828
|
+
if process.returncode is None:
|
|
829
|
+
process.kill()
|
|
830
|
+
await process.wait()
|
|
831
|
+
raise
|
|
832
|
+
if process.returncode:
|
|
833
|
+
try:
|
|
834
|
+
error = json.loads(stdout)["error"]
|
|
835
|
+
except (ValueError, KeyError):
|
|
836
|
+
error = stderr.decode() or "Python tool runner failed"
|
|
837
|
+
raise RoomException(error)
|
|
838
|
+
typer.echo(stdout.decode().rstrip())
|
|
@@ -427,3 +427,90 @@ async def test_agent_use_command_runs_tui_with_resolved_project(
|
|
|
427
427
|
}
|
|
428
428
|
]
|
|
429
429
|
assert client.closed is True
|
|
430
|
+
|
|
431
|
+
|
|
432
|
+
@pytest.mark.asyncio
|
|
433
|
+
async def test_python_tool_test_runs_embedded_source_without_login(
|
|
434
|
+
monkeypatch, tmp_path, capsys
|
|
435
|
+
):
|
|
436
|
+
definition = {
|
|
437
|
+
"type": "python",
|
|
438
|
+
"name": "lookup",
|
|
439
|
+
"input_schema": {
|
|
440
|
+
"type": "object",
|
|
441
|
+
"properties": {"id": {"type": "string"}},
|
|
442
|
+
"required": ["id"],
|
|
443
|
+
"additionalProperties": False,
|
|
444
|
+
},
|
|
445
|
+
"source": "async def lookup(args): return args",
|
|
446
|
+
}
|
|
447
|
+
spec = tmp_path / "agent.yaml"
|
|
448
|
+
spec.write_text(
|
|
449
|
+
json.dumps(
|
|
450
|
+
{"metadata": {"name": "test"}, "allowed_models": [], "tools": [definition]}
|
|
451
|
+
)
|
|
452
|
+
)
|
|
453
|
+
monkeypatch.setenv("MESHAGENT_PYTHON_TOOLS_BIN", "/test/runner")
|
|
454
|
+
|
|
455
|
+
async def unexpected_login():
|
|
456
|
+
raise AssertionError("plain tools must not require login")
|
|
457
|
+
|
|
458
|
+
class Process:
|
|
459
|
+
returncode = 0
|
|
460
|
+
|
|
461
|
+
async def communicate(self, data):
|
|
462
|
+
payload = json.loads(data)
|
|
463
|
+
assert payload["tool"]["source"] == definition["source"]
|
|
464
|
+
assert payload["input"] == {"id": "abc"}
|
|
465
|
+
assert payload["proxy"] is None
|
|
466
|
+
return b'{"result":{"id":"abc"},"logs":"","requests":[]}', b""
|
|
467
|
+
|
|
468
|
+
async def spawn(*args, **kwargs):
|
|
469
|
+
assert args == ("/test/runner",)
|
|
470
|
+
return Process()
|
|
471
|
+
|
|
472
|
+
monkeypatch.setattr(agents, "get_client", unexpected_login)
|
|
473
|
+
monkeypatch.setattr(agents.asyncio, "create_subprocess_exec", spawn)
|
|
474
|
+
await agents.test_python_tool(spec=spec, tool="lookup", input_json='{"id":"abc"}')
|
|
475
|
+
assert json.loads(capsys.readouterr().out)["result"] == {"id": "abc"}
|
|
476
|
+
|
|
477
|
+
|
|
478
|
+
@pytest.mark.asyncio
|
|
479
|
+
async def test_python_tool_test_reports_runner_failure(monkeypatch, tmp_path):
|
|
480
|
+
from meshagent.api import RoomException
|
|
481
|
+
|
|
482
|
+
spec = tmp_path / "agent.yaml"
|
|
483
|
+
spec.write_text(
|
|
484
|
+
json.dumps(
|
|
485
|
+
{
|
|
486
|
+
"metadata": {"name": "test"},
|
|
487
|
+
"allowed_models": [],
|
|
488
|
+
"tools": [
|
|
489
|
+
{
|
|
490
|
+
"name": "lookup",
|
|
491
|
+
"input_schema": {
|
|
492
|
+
"type": "object",
|
|
493
|
+
"properties": {},
|
|
494
|
+
"required": [],
|
|
495
|
+
"additionalProperties": False,
|
|
496
|
+
},
|
|
497
|
+
"source": "async def lookup(args): raise ValueError('bad customer')",
|
|
498
|
+
}
|
|
499
|
+
],
|
|
500
|
+
}
|
|
501
|
+
)
|
|
502
|
+
)
|
|
503
|
+
monkeypatch.setenv("MESHAGENT_PYTHON_TOOLS_BIN", "/test/runner")
|
|
504
|
+
|
|
505
|
+
class Process:
|
|
506
|
+
returncode = 1
|
|
507
|
+
|
|
508
|
+
async def communicate(self, data):
|
|
509
|
+
return b'{"error":"tool lookup: bad customer"}', b""
|
|
510
|
+
|
|
511
|
+
async def spawn(*args, **kwargs):
|
|
512
|
+
return Process()
|
|
513
|
+
|
|
514
|
+
monkeypatch.setattr(agents.asyncio, "create_subprocess_exec", spawn)
|
|
515
|
+
with pytest.raises(RoomException, match="tool lookup: bad customer"):
|
|
516
|
+
await agents.test_python_tool(spec=spec, tool="lookup", input_json="{}")
|
|
@@ -10,6 +10,7 @@ from meshagent.cli.local_settings import (
|
|
|
10
10
|
DEFAULT_API_URL,
|
|
11
11
|
SavedProfileRecord,
|
|
12
12
|
list_saved_profiles,
|
|
13
|
+
normalize_api_url,
|
|
13
14
|
resolve_api_url,
|
|
14
15
|
switch_active_profile,
|
|
15
16
|
)
|
|
@@ -99,10 +100,21 @@ async def switch(
|
|
|
99
100
|
),
|
|
100
101
|
),
|
|
101
102
|
] = None,
|
|
103
|
+
api_url: Annotated[
|
|
104
|
+
str | None,
|
|
105
|
+
typer.Option(
|
|
106
|
+
"--api-url", help="Select the environment containing the saved profile."
|
|
107
|
+
),
|
|
108
|
+
] = None,
|
|
102
109
|
):
|
|
103
110
|
selected_profile_selector = profile
|
|
104
111
|
if selected_profile_selector is None:
|
|
105
112
|
saved_profiles = list_saved_profiles()
|
|
113
|
+
environment = normalize_api_url(api_url)
|
|
114
|
+
if environment is not None:
|
|
115
|
+
saved_profiles = [
|
|
116
|
+
saved for saved in saved_profiles if saved.api_url == environment
|
|
117
|
+
]
|
|
106
118
|
if len(saved_profiles) == 0:
|
|
107
119
|
typer.echo("No saved local profiles.")
|
|
108
120
|
return
|
|
@@ -118,14 +130,18 @@ async def switch(
|
|
|
118
130
|
typer.echo(result.message)
|
|
119
131
|
return
|
|
120
132
|
|
|
121
|
-
selected_profile_selector = result.selected_profile.
|
|
133
|
+
selected_profile_selector = result.selected_profile.key
|
|
122
134
|
else:
|
|
123
135
|
for saved_profile in saved_profiles:
|
|
124
136
|
typer.echo(_format_saved_profile(saved_profile))
|
|
125
137
|
return
|
|
126
138
|
|
|
127
139
|
try:
|
|
128
|
-
selected_profile =
|
|
140
|
+
selected_profile = (
|
|
141
|
+
switch_active_profile(selected_profile_selector, api_url=api_url)
|
|
142
|
+
if api_url is not None
|
|
143
|
+
else switch_active_profile(selected_profile_selector)
|
|
144
|
+
)
|
|
129
145
|
except LookupError as exc:
|
|
130
146
|
typer.echo(str(exc))
|
|
131
147
|
raise typer.Exit(code=1) from exc
|
|
@@ -249,7 +249,7 @@ async def test_switch_launches_tui_when_no_selector_in_tty(monkeypatch) -> None:
|
|
|
249
249
|
|
|
250
250
|
await auth.switch()
|
|
251
251
|
|
|
252
|
-
assert selected_selectors == [
|
|
252
|
+
assert selected_selectors == [saved_profiles[1].key]
|
|
253
253
|
assert output == [
|
|
254
254
|
"Active profile: * Taylor Swift [user-456] @ https://api.meshagent.test",
|
|
255
255
|
]
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import json
|
|
2
2
|
import os
|
|
3
|
+
import tempfile
|
|
3
4
|
from dataclasses import dataclass
|
|
4
5
|
from pathlib import Path
|
|
5
|
-
from pydantic import BaseModel, Field
|
|
6
|
+
from pydantic import BaseModel, Field, TypeAdapter, ValidationError
|
|
6
7
|
|
|
7
8
|
from meshagent.api.client import User
|
|
8
9
|
|
|
@@ -100,8 +101,10 @@ class StoredUserSettings(BaseModel):
|
|
|
100
101
|
|
|
101
102
|
|
|
102
103
|
class CLISettings(BaseModel):
|
|
104
|
+
# Retain the on-disk field name; its value is now an environment/profile key.
|
|
103
105
|
active_user_id: str | None = None
|
|
104
106
|
users: dict[str, StoredUserSettings] = Field(default_factory=dict)
|
|
107
|
+
active_profiles: dict[str, str] = Field(default_factory=dict)
|
|
105
108
|
|
|
106
109
|
|
|
107
110
|
@dataclass(frozen=True, slots=True)
|
|
@@ -111,6 +114,77 @@ class SavedProfileRecord:
|
|
|
111
114
|
api_url: str | None
|
|
112
115
|
is_active: bool
|
|
113
116
|
|
|
117
|
+
@property
|
|
118
|
+
def key(self) -> str:
|
|
119
|
+
return profile_key(self.user_id, self.api_url)
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
def profile_key(user_id: str, api_url: str | None) -> str:
|
|
123
|
+
return json.dumps(
|
|
124
|
+
[normalize_api_url(api_url) or DEFAULT_API_URL, user_id],
|
|
125
|
+
ensure_ascii=False,
|
|
126
|
+
separators=(",", ":"),
|
|
127
|
+
)
|
|
128
|
+
|
|
129
|
+
|
|
130
|
+
_PROFILE_KEY = TypeAdapter(tuple[str, str])
|
|
131
|
+
|
|
132
|
+
|
|
133
|
+
def _stored_user_id(key: str, user: StoredUserSettings) -> str:
|
|
134
|
+
if user.profile is not None:
|
|
135
|
+
return user.profile.id
|
|
136
|
+
try:
|
|
137
|
+
_, user_id = _PROFILE_KEY.validate_json(key)
|
|
138
|
+
return user_id
|
|
139
|
+
except ValidationError:
|
|
140
|
+
return key
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
def _upgrade_settings(settings: CLISettings) -> bool:
|
|
144
|
+
original = settings.model_copy(deep=True)
|
|
145
|
+
users: dict[str, StoredUserSettings] = {}
|
|
146
|
+
aliases: dict[str, str] = {}
|
|
147
|
+
active_profiles: dict[str, str] = {}
|
|
148
|
+
# Existing scoped records take precedence if an older CLI added a legacy
|
|
149
|
+
# record to an upgraded file. Merge project settings without losing keys.
|
|
150
|
+
for key, user in sorted(
|
|
151
|
+
settings.users.items(),
|
|
152
|
+
key=lambda item: (
|
|
153
|
+
item[0] == profile_key(_stored_user_id(*item), item[1].api_url),
|
|
154
|
+
item[0],
|
|
155
|
+
),
|
|
156
|
+
):
|
|
157
|
+
api_url = normalize_api_url(user.api_url) or DEFAULT_API_URL
|
|
158
|
+
user_id = _stored_user_id(key, user)
|
|
159
|
+
scoped_key = profile_key(user_id, api_url)
|
|
160
|
+
aliases[key] = scoped_key
|
|
161
|
+
user.api_url = api_url
|
|
162
|
+
previous = users.get(scoped_key)
|
|
163
|
+
if previous is not None:
|
|
164
|
+
user = user.model_copy(
|
|
165
|
+
update={
|
|
166
|
+
"profile": user.profile or previous.profile,
|
|
167
|
+
"session": user.session or previous.session,
|
|
168
|
+
"project": _merge_project_settings(user.project, previous.project),
|
|
169
|
+
}
|
|
170
|
+
)
|
|
171
|
+
users[scoped_key] = user
|
|
172
|
+
active_profiles.setdefault(api_url, scoped_key)
|
|
173
|
+
for api_url, key in settings.active_profiles.items():
|
|
174
|
+
api_url = normalize_api_url(api_url) or DEFAULT_API_URL
|
|
175
|
+
key = aliases.get(key, key)
|
|
176
|
+
if key in users and users[key].api_url == api_url:
|
|
177
|
+
active_profiles[api_url] = key
|
|
178
|
+
active_key = aliases.get(settings.active_user_id or "")
|
|
179
|
+
if active_key is None and len(users) == 1:
|
|
180
|
+
active_key = next(iter(users))
|
|
181
|
+
if active_key is not None:
|
|
182
|
+
active_profiles[users[active_key].api_url or DEFAULT_API_URL] = active_key
|
|
183
|
+
settings.users = users
|
|
184
|
+
settings.active_user_id = active_key
|
|
185
|
+
settings.active_profiles = active_profiles
|
|
186
|
+
return settings != original
|
|
187
|
+
|
|
114
188
|
|
|
115
189
|
def normalize_api_url(api_url: str | None) -> str | None:
|
|
116
190
|
if api_url is None:
|
|
@@ -128,12 +202,6 @@ def _ensure_settings_dir() -> None:
|
|
|
128
202
|
|
|
129
203
|
|
|
130
204
|
def _cleanup_settings(settings: CLISettings) -> None:
|
|
131
|
-
local_state = settings.users.get(LOCAL_STATE_USER_ID)
|
|
132
|
-
if local_state is not None and local_state.is_empty():
|
|
133
|
-
del settings.users[LOCAL_STATE_USER_ID]
|
|
134
|
-
if settings.active_user_id == LOCAL_STATE_USER_ID:
|
|
135
|
-
settings.active_user_id = None
|
|
136
|
-
|
|
137
205
|
if (
|
|
138
206
|
settings.active_user_id is not None
|
|
139
207
|
and settings.active_user_id not in settings.users
|
|
@@ -144,9 +212,19 @@ def _cleanup_settings(settings: CLISettings) -> None:
|
|
|
144
212
|
def _save_settings(settings: CLISettings) -> None:
|
|
145
213
|
_cleanup_settings(settings)
|
|
146
214
|
_ensure_settings_dir()
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
215
|
+
temporary_path: Path | None = None
|
|
216
|
+
try:
|
|
217
|
+
with tempfile.NamedTemporaryFile(
|
|
218
|
+
mode="w", dir=SETTINGS_DIR, delete=False
|
|
219
|
+
) as file:
|
|
220
|
+
temporary_path = Path(file.name)
|
|
221
|
+
json.dump(settings.model_dump(mode="json"), file, indent=2, sort_keys=True)
|
|
222
|
+
file.flush()
|
|
223
|
+
os.fsync(file.fileno())
|
|
224
|
+
os.replace(temporary_path, SETTINGS_FILE)
|
|
225
|
+
finally:
|
|
226
|
+
if temporary_path is not None:
|
|
227
|
+
temporary_path.unlink(missing_ok=True)
|
|
150
228
|
|
|
151
229
|
|
|
152
230
|
def _load_json_model(path: Path, model_type: type[BaseModel]) -> BaseModel | None:
|
|
@@ -185,12 +263,20 @@ def load_settings() -> CLISettings:
|
|
|
185
263
|
try:
|
|
186
264
|
_ensure_settings_dir()
|
|
187
265
|
if SETTINGS_FILE.exists():
|
|
188
|
-
|
|
266
|
+
settings = CLISettings.model_validate_json(SETTINGS_FILE.read_text())
|
|
267
|
+
if _upgrade_settings(settings):
|
|
268
|
+
try:
|
|
269
|
+
_save_settings(settings)
|
|
270
|
+
except OSError as ex:
|
|
271
|
+
if ex.errno not in (1, 13, 30):
|
|
272
|
+
raise
|
|
273
|
+
return settings
|
|
189
274
|
|
|
190
275
|
migrated = _migrate_legacy_settings()
|
|
191
276
|
if migrated is None:
|
|
192
277
|
return CLISettings()
|
|
193
278
|
|
|
279
|
+
_upgrade_settings(migrated)
|
|
194
280
|
try:
|
|
195
281
|
_save_settings(migrated)
|
|
196
282
|
_remove_legacy_files()
|
|
@@ -204,16 +290,19 @@ def load_settings() -> CLISettings:
|
|
|
204
290
|
raise
|
|
205
291
|
|
|
206
292
|
|
|
207
|
-
def _active_user_id(settings: CLISettings) -> str | None:
|
|
293
|
+
def _active_user_id(settings: CLISettings, api_url: str | None = None) -> str | None:
|
|
294
|
+
environment = normalize_api_url(api_url) or normalize_api_url(
|
|
295
|
+
os.getenv("MESHAGENT_API_URL")
|
|
296
|
+
)
|
|
297
|
+
if environment is not None:
|
|
298
|
+
key = settings.active_profiles.get(environment)
|
|
299
|
+
return key if key in settings.users else None
|
|
208
300
|
if (
|
|
209
301
|
settings.active_user_id is not None
|
|
210
302
|
and settings.active_user_id in settings.users
|
|
211
303
|
):
|
|
212
304
|
return settings.active_user_id
|
|
213
305
|
|
|
214
|
-
if LOCAL_STATE_USER_ID in settings.users:
|
|
215
|
-
return LOCAL_STATE_USER_ID
|
|
216
|
-
|
|
217
306
|
if len(settings.users) == 1:
|
|
218
307
|
return next(iter(settings.users))
|
|
219
308
|
|
|
@@ -227,19 +316,30 @@ def _active_user(settings: CLISettings) -> StoredUserSettings | None:
|
|
|
227
316
|
return settings.users.get(user_id)
|
|
228
317
|
|
|
229
318
|
|
|
230
|
-
def
|
|
231
|
-
|
|
319
|
+
def _select_profile(settings: CLISettings, key: str) -> None:
|
|
320
|
+
settings.active_user_id = key
|
|
321
|
+
settings.active_profiles[settings.users[key].api_url or DEFAULT_API_URL] = key
|
|
322
|
+
|
|
323
|
+
|
|
324
|
+
def _ensure_active_user(
|
|
325
|
+
settings: CLISettings, api_url: str | None = None
|
|
326
|
+
) -> tuple[str, StoredUserSettings]:
|
|
327
|
+
user_id = _active_user_id(settings, api_url)
|
|
232
328
|
if user_id is None:
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
329
|
+
environment = (
|
|
330
|
+
normalize_api_url(api_url)
|
|
331
|
+
or normalize_api_url(os.getenv("MESHAGENT_API_URL"))
|
|
332
|
+
or DEFAULT_API_URL
|
|
333
|
+
)
|
|
334
|
+
user_id = profile_key(LOCAL_STATE_USER_ID, environment)
|
|
335
|
+
settings.users.setdefault(user_id, StoredUserSettings(api_url=environment))
|
|
236
336
|
|
|
237
337
|
user_settings = settings.users.get(user_id)
|
|
238
338
|
if user_settings is None:
|
|
239
339
|
settings.users[user_id] = StoredUserSettings()
|
|
240
340
|
user_settings = settings.users[user_id]
|
|
241
341
|
|
|
242
|
-
settings
|
|
342
|
+
_select_profile(settings, user_id)
|
|
243
343
|
return user_id, user_settings
|
|
244
344
|
|
|
245
345
|
|
|
@@ -257,7 +357,9 @@ def _merge_project_settings(
|
|
|
257
357
|
|
|
258
358
|
|
|
259
359
|
def get_active_user_id() -> str | None:
|
|
260
|
-
|
|
360
|
+
settings = load_settings()
|
|
361
|
+
key = _active_user_id(settings)
|
|
362
|
+
return _stored_user_id(key, settings.users[key]) if key is not None else None
|
|
261
363
|
|
|
262
364
|
|
|
263
365
|
def get_active_profile() -> StoredUserProfile | None:
|
|
@@ -280,7 +382,7 @@ def set_active_session(
|
|
|
280
382
|
api_url: str | None = None,
|
|
281
383
|
) -> None:
|
|
282
384
|
settings = load_settings()
|
|
283
|
-
_, active_user = _ensure_active_user(settings)
|
|
385
|
+
_, active_user = _ensure_active_user(settings, api_url)
|
|
284
386
|
active_user.session = session
|
|
285
387
|
normalized_api_url = normalize_api_url(api_url)
|
|
286
388
|
if normalized_api_url is not None:
|
|
@@ -294,17 +396,17 @@ def set_local_session(
|
|
|
294
396
|
api_url: str | None = None,
|
|
295
397
|
) -> None:
|
|
296
398
|
settings = load_settings()
|
|
297
|
-
|
|
399
|
+
normalized_api_url = normalize_api_url(api_url) or resolve_api_url()
|
|
400
|
+
key = profile_key(LOCAL_STATE_USER_ID, normalized_api_url)
|
|
401
|
+
local_settings = settings.users.get(key)
|
|
298
402
|
if local_settings is None:
|
|
299
403
|
local_settings = StoredUserSettings()
|
|
300
404
|
|
|
301
405
|
local_settings.session = session
|
|
302
|
-
|
|
303
|
-
if normalized_api_url is not None:
|
|
304
|
-
local_settings.api_url = normalized_api_url
|
|
406
|
+
local_settings.api_url = normalized_api_url
|
|
305
407
|
|
|
306
|
-
settings.users[
|
|
307
|
-
settings
|
|
408
|
+
settings.users[key] = local_settings
|
|
409
|
+
_select_profile(settings, key)
|
|
308
410
|
_save_settings(settings)
|
|
309
411
|
|
|
310
412
|
|
|
@@ -402,11 +504,14 @@ def save_authenticated_profile(
|
|
|
402
504
|
api_url: str,
|
|
403
505
|
) -> None:
|
|
404
506
|
settings = load_settings()
|
|
405
|
-
|
|
507
|
+
api_url = normalize_api_url(api_url) or DEFAULT_API_URL
|
|
508
|
+
key = profile_key(profile.id, api_url)
|
|
509
|
+
target_settings = settings.users.get(key)
|
|
406
510
|
if target_settings is None:
|
|
407
511
|
target_settings = StoredUserSettings()
|
|
408
512
|
|
|
409
|
-
|
|
513
|
+
local_key = profile_key(LOCAL_STATE_USER_ID, api_url)
|
|
514
|
+
local_settings = settings.users.get(local_key)
|
|
410
515
|
if local_settings is not None and profile.id != LOCAL_STATE_USER_ID:
|
|
411
516
|
target_settings.project = _merge_project_settings(
|
|
412
517
|
local_settings.project,
|
|
@@ -414,13 +519,13 @@ def save_authenticated_profile(
|
|
|
414
519
|
)
|
|
415
520
|
if target_settings.api_url is None:
|
|
416
521
|
target_settings.api_url = local_settings.api_url
|
|
417
|
-
del settings.users[
|
|
522
|
+
del settings.users[local_key]
|
|
418
523
|
|
|
419
524
|
target_settings.profile = profile
|
|
420
525
|
target_settings.session = session
|
|
421
526
|
target_settings.api_url = normalize_api_url(api_url)
|
|
422
|
-
settings.users[
|
|
423
|
-
settings
|
|
527
|
+
settings.users[key] = target_settings
|
|
528
|
+
_select_profile(settings, key)
|
|
424
529
|
_save_settings(settings)
|
|
425
530
|
|
|
426
531
|
|
|
@@ -429,8 +534,8 @@ def list_saved_profiles() -> list[SavedProfileRecord]:
|
|
|
429
534
|
active_user_id = _active_user_id(settings)
|
|
430
535
|
profiles: list[SavedProfileRecord] = []
|
|
431
536
|
|
|
432
|
-
for
|
|
433
|
-
if
|
|
537
|
+
for key, user_settings in settings.users.items():
|
|
538
|
+
if _stored_user_id(key, user_settings) == LOCAL_STATE_USER_ID:
|
|
434
539
|
continue
|
|
435
540
|
if user_settings.profile is None or user_settings.session is None:
|
|
436
541
|
continue
|
|
@@ -439,10 +544,10 @@ def list_saved_profiles() -> list[SavedProfileRecord]:
|
|
|
439
544
|
|
|
440
545
|
profiles.append(
|
|
441
546
|
SavedProfileRecord(
|
|
442
|
-
user_id=
|
|
547
|
+
user_id=user_settings.profile.id,
|
|
443
548
|
profile=user_settings.profile,
|
|
444
549
|
api_url=normalize_api_url(user_settings.api_url),
|
|
445
|
-
is_active=
|
|
550
|
+
is_active=key == active_user_id,
|
|
446
551
|
)
|
|
447
552
|
)
|
|
448
553
|
|
|
@@ -455,19 +560,34 @@ def list_saved_profiles() -> list[SavedProfileRecord]:
|
|
|
455
560
|
return profiles
|
|
456
561
|
|
|
457
562
|
|
|
458
|
-
def switch_active_profile(
|
|
563
|
+
def switch_active_profile(
|
|
564
|
+
selector: str, *, api_url: str | None = None
|
|
565
|
+
) -> SavedProfileRecord:
|
|
459
566
|
normalized_selector = selector.strip()
|
|
460
567
|
if normalized_selector == "":
|
|
461
568
|
raise LookupError("Profile selector cannot be empty.")
|
|
462
569
|
|
|
463
570
|
profiles = list_saved_profiles()
|
|
571
|
+
explicit_environment = normalize_api_url(api_url)
|
|
572
|
+
if explicit_environment is not None:
|
|
573
|
+
profiles = [
|
|
574
|
+
profile for profile in profiles if profile.api_url == explicit_environment
|
|
575
|
+
]
|
|
576
|
+
environment = explicit_environment or normalize_api_url(
|
|
577
|
+
os.getenv("MESHAGENT_API_URL")
|
|
578
|
+
)
|
|
579
|
+
exact_keys = [profile for profile in profiles if profile.key == normalized_selector]
|
|
580
|
+
if not exact_keys and environment is not None:
|
|
581
|
+
profiles = [profile for profile in profiles if profile.api_url == environment]
|
|
464
582
|
exact_id_matches = [
|
|
465
583
|
profile for profile in profiles if profile.user_id == normalized_selector
|
|
466
584
|
]
|
|
467
|
-
if len(
|
|
585
|
+
if len(exact_keys) == 1:
|
|
586
|
+
selected = exact_keys[0]
|
|
587
|
+
elif len(exact_id_matches) == 1:
|
|
468
588
|
selected = exact_id_matches[0]
|
|
469
589
|
else:
|
|
470
|
-
email_matches = [
|
|
590
|
+
email_matches = exact_id_matches or [
|
|
471
591
|
profile
|
|
472
592
|
for profile in profiles
|
|
473
593
|
if profile.profile.email is not None
|
|
@@ -480,12 +600,12 @@ def switch_active_profile(selector: str) -> SavedProfileRecord:
|
|
|
480
600
|
if len(email_matches) > 1:
|
|
481
601
|
raise LookupError(
|
|
482
602
|
f"More than one saved local profile matches '{normalized_selector}'. "
|
|
483
|
-
"Use the user id
|
|
603
|
+
"Use --api-url to select the environment, or select a unique user id."
|
|
484
604
|
)
|
|
485
605
|
selected = email_matches[0]
|
|
486
606
|
|
|
487
607
|
settings = load_settings()
|
|
488
|
-
settings
|
|
608
|
+
_select_profile(settings, selected.key)
|
|
489
609
|
_save_settings(settings)
|
|
490
610
|
apply_active_profile_api_url_environment()
|
|
491
611
|
return SavedProfileRecord(
|